@isentinel/eslint-config 6.0.0-beta.21 → 6.0.0-beta.23

package/dist/oxlint.mjs

@@ -18,7 +18,7 @@ import globals from "globals";
 const staysInEslint = {
 	"e18e/* (optionally type-aware)": "Four e18e rules (prefer-array-at, prefer-array-to-reversed, prefer-array-to-sorted, prefer-spread-syntax) run without type information but detect more with it, so they stay in ESLint (see optionallyTypeAwareRules); the rest run in oxlint as a jsPlugin",
 	"eslint-comments/*": "Lints eslint-disable directives, which only exist in ESLint-linted code; oxlint-comments covers oxlint directives",
-	"flawless/naming-convention": "Type-aware custom rule; oxlint jsPlugins have no type information. The syntax-only flawless rules (arrow-return-style, max-lines-per-function, no-export-default-arrow, padding-after-expect-assertions, prefer-parameter-destructuring, the react jsx-shorthand-*, purity, no-unnecessary-use-*, prefer-destructuring-assignment) are mapped and run in oxlint. flawless/no-redundant-tsconfig-options, flawless/toml-* and flawless/yaml-* lint non-JS files and stay in ESLint",
+	"flawless/naming-convention": "Type-aware custom rule; oxlint jsPlugins have no type information. The syntax-only flawless rules (arrow-return-style, max-lines-per-function, no-conditional-in-test, no-export-default-arrow, padding-after-expect-assertions, prefer-ending-with-an-expect, prefer-expect-assertions-count, prefer-parameter-destructuring, the react jsx-shorthand-*, purity, no-unnecessary-use-*, prefer-destructuring-assignment) are mapped and run in oxlint. flawless/no-redundant-tsconfig-options, flawless/toml-* and flawless/yaml-* lint non-JS files and stay in ESLint",
 	"flawless/prefer-read-only-props": "Type-aware custom rule; oxlint jsPlugins have no type information",
 	"format-lua/*": "Oxlint cannot lint Lua files",
 	"jest/* (type-aware)": "Four type-aware jest rules stay in ESLint (see typeAwareJsPluginRules); the rest run in oxlint via eslint-plugin-jest as a jsPlugin (renamed jest-js, since oxlint reserves the native jest prefix), which honors settings.jest.globalPackage = @rbxts/jest-globals (the NATIVE oxlint jest plugin does not, https://github.com/oxc-project/oxc/issues/23290)",
@@ -534,11 +534,14 @@ const oxlintRuleMapping = {
 	"flawless/jsx-shorthand-boolean": "js-plugin",
 	"flawless/jsx-shorthand-fragment": "js-plugin",
 	"flawless/max-lines-per-function": "js-plugin",
+	"flawless/no-conditional-in-test": "js-plugin",
 	"flawless/no-export-default-arrow": "js-plugin",
 	"flawless/no-unnecessary-use-callback": "js-plugin",
 	"flawless/no-unnecessary-use-memo": "js-plugin",
 	"flawless/padding-after-expect-assertions": "js-plugin",
 	"flawless/prefer-destructuring-assignment": "js-plugin",
+	"flawless/prefer-ending-with-an-expect": "js-plugin",
+	"flawless/prefer-expect-assertions-count": "js-plugin",
 	"flawless/prefer-parameter-destructuring": "js-plugin",
 	"flawless/purity": "js-plugin",
 	"react/error-boundaries": "js-plugin",
@@ -658,7 +661,6 @@ const oxlintRuleMapping = {
 	"vitest/no-alias-methods": "native",
 	"vitest/no-commented-out-tests": "native",
 	"vitest/no-conditional-expect": "native",
-	"vitest/no-conditional-in-test": "native",
 	"vitest/no-conditional-tests": "native",
 	"vitest/no-disabled-tests": "native",
 	"vitest/no-duplicate-hooks": "native",
@@ -1428,6 +1430,19 @@ function isRecord(value) {
 }
 createRequire(import.meta.url);
 /**
+* Synchronous {@link findWorkspaceRoot}, for the oxlint factory.
+*
+* The oxlint factory is synchronous, so it cannot await the async variant.
+*
+* @param cwd - The directory to resolve from, defaulting to the current
+*   working directory.
+* @returns The absolute path of the workspace root directory.
+*/
+function findWorkspaceRootSync(cwd = process.cwd()) {
+	const workspaceFile = findUpSync("pnpm-workspace.yaml", { cwd });
+	return workspaceFile === void 0 ? cwd : path.dirname(workspaceFile);
+}
+/**
 * Whether the environment signals a CI run. Treats an unset, empty, `"false"`
 * or `"0"` `CI` value as not-CI, so a deliberately falsy `CI=false` is honoured
 * rather than read as truthy.
@@ -2046,14 +2061,133 @@ function oxlintComments({ prettierOptions = {}, stylistic = true } = {}) {
 	];
 }
 //#endregion
+//#region src/anchors.ts
+/**
+* Matches a glob that anchors on one or more literal ancestor directory names,
+* capturing the run of literal segments that follows the leading `**\/`.
+*
+* `**\/scripts/**\/*.ts` captures `scripts/`, and `**\/.github/scripts/**\/*`
+* captures `.github/scripts/`. Basename anchors such as `**\/*config.ts` or
+* `**\/cli.ts` do not match, because the segment after `**\/` is not literal.
+*/
+const ANCESTOR_ANCHOR = /^\*\*\/((?:[^*?{}[\]/]+\/)+)/;
+/**
+* Resolves a config directory to a workspace-root-relative path.
+*
+* Comparison has to happen in workspace-root-relative terms: matching against
+* absolute paths would let a checkout living at `C:\dev\scripts\repo` satisfy a
+* `**\/scripts/` anchor for every project in it.
+*
+* @param configDirectory - The absolute directory of the config being generated.
+* @param workspaceRoot - The absolute workspace root.
+* @returns The relative path with POSIX separators, or `undefined` when the
+*   config sits at or outside the workspace root.
+*/
+function workspaceRelativeDirectory(configDirectory, workspaceRoot) {
+	const relative = path.relative(workspaceRoot, configDirectory);
+	if (relative === "" || relative.startsWith("..") || path.isAbsolute(relative)) return;
+	return relative.split(path.sep).join("/");
+}
+/**
+* Rewrites an ancestor-anchored glob so it still matches from a config that
+* already lives inside the anchored directory.
+*
+* The original pattern is always kept, so a directory of the same name nested
+* beneath the config keeps matching. When the config's own path already
+* satisfies the anchor, an additional anchor-stripped variant is emitted:
+* `**\/scripts/**\/*.ts` from a config at `scripts/` also yields `**\/*.ts`.
+*
+* A partial anchor is only honoured when it matches the tail of the config's
+* path — a config at `.github/foo` cannot satisfy `**\/.github/scripts/`,
+* because nothing below it lives in `.github/scripts`.
+*
+* This exists because oxlint has no per-override base path: `basePath` is a
+* hard parse error, and the upstream knob is still unresolved
+* (oxc-project/oxc#24276). The ESLint side uses `basePath` instead and needs no
+* rewrite.
+*
+* @param pattern - The glob to rewrite.
+* @param relativeConfigDirectory - The config's directory, relative to the workspace
+*   root, POSIX-separated.
+* @returns The patterns to emit, always including the original.
+*/
+function rebaseAncestorAnchor(pattern, relativeConfigDirectory) {
+	const anchor = splitAncestorAnchor(pattern);
+	if (anchor === void 0) return [pattern];
+	const directorySegments = relativeConfigDirectory.split("/").filter((segment) => segment !== "");
+	if (directorySegments.length === 0) return [pattern];
+	const { segments, tail } = anchor;
+	for (let { length } = segments; length > 0; length -= 1) {
+		const run = segments.slice(0, length);
+		if (length === segments.length ? containsRun(directorySegments, run) : endsWithRun(directorySegments, run)) return [pattern, [...segments.slice(length), tail].join("/")];
+	}
+	return [pattern];
+}
+/**
+* Splits a glob into its literal ancestor-directory anchor and the tail matched
+* beneath it.
+*
+* @param pattern - The glob to inspect.
+* @returns The anchor segments and tail, or `undefined` when the pattern is not
+*   anchored on an ancestor directory.
+*/
+function splitAncestorAnchor(pattern) {
+	const match = ANCESTOR_ANCHOR.exec(pattern);
+	if (match === null) return;
+	const [matched, literal] = match;
+	if (literal === void 0) return;
+	const tail = pattern.slice(matched.length);
+	if (tail === "") return;
+	return {
+		segments: literal.split("/").filter((segment) => segment !== ""),
+		tail
+	};
+}
+/**
+* Whether `run` appears in `segments` as a contiguous slice ending at its end.
+*
+* @param segments - The segments to search.
+* @param run - The contiguous run to look for.
+* @returns Whether `segments` ends with `run`.
+*/
+function endsWithRun(segments, run) {
+	if (run.length > segments.length) return false;
+	const offset = segments.length - run.length;
+	return run.every((segment, index) => segments[offset + index] === segment);
+}
+/**
+* Whether `run` appears anywhere in `segments` as a contiguous slice.
+*
+* @param segments - The segments to search.
+* @param run - The contiguous run to look for.
+* @returns Whether `segments` contains `run`.
+*/
+function containsRun(segments, run) {
+	for (let start = 0; start + run.length <= segments.length; start += 1) if (run.every((segment, index) => segments[start + index] === segment)) return true;
+	return false;
+}
+//#endregion
 //#region src/oxlint/configs/disables.ts
-function oxlintDisables({ root }) {
-	return [
+/**
+* Rule relaxations keyed on where a file lives.
+*
+* @param options - The resolved factory options.
+* @param options.configDirectory - The directory holding the consuming config,
+*   used to widen ancestor-anchored globs. Documented on the factory's
+*   `configDirectory` option.
+* @param options.root - Globs identifying root-level files.
+* @param options.workspaceRoot - Absolute workspace root.
+* @returns The disables configs.
+*/
+function oxlintDisables({ configDirectory, root, workspaceRoot }) {
+	const relativeConfigDirectory = configDirectory === void 0 ? void 0 : workspaceRelativeDirectory(configDirectory, workspaceRoot);
+	return rebaseAnchoredFiles([
 		...createOxlintConfigs({
 			name: "isentinel/disables/scripts",
 			files: [`**/scripts/${GLOB_SRC}`],
 			rules: {
 				"antfu/no-top-level-await": "off",
+				"max-lines": "off",
 				"no-console": "off",
 				"small-rules/require-async-suffix": "off",
 				"ts/explicit-function-return-type": "off"
@@ -2150,7 +2284,32 @@ function oxlintDisables({ root }) {
 			files: [GLOB_JSX, GLOB_TSX],
 			rules: { "flawless/max-lines-per-function": "off" }
 		})
-	];
+	], relativeConfigDirectory);
+}
+/**
+* Rewrites ancestor-anchored `files` globs so they still match from a nested
+* config.
+*
+* Applied to every block rather than a curated list, so a block added later
+* with a directory anchor is covered without anyone remembering to opt it in.
+* Patterns that are not ancestor-anchored pass through untouched.
+*
+* @param configs - The configs to rewrite.
+* @param relativeConfigDirectory - The config's directory relative to the workspace
+*   root, or `undefined` when it is the workspace root or outside it.
+* @returns The configs, with anchored globs widened.
+*/
+function rebaseAnchoredFiles(configs, relativeConfigDirectory) {
+	if (relativeConfigDirectory === void 0) return configs;
+	return configs.map((config) => {
+		const rebased = config.files.flatMap((pattern) => {
+			return rebaseAncestorAnchor(pattern, relativeConfigDirectory);
+		});
+		return {
+			...config,
+			files: [...new Set(rebased)]
+		};
+	});
 }
 //#endregion
 //#region src/rules/e18e.ts
@@ -3680,7 +3839,7 @@ function oxlintStylistic(options = {}) {
 //#endregion
 //#region src/rules/test.ts
 /**
-* Rules that make no sense in a type test (`*.test-d.ts`): these files assert
+* Rules that make no sense in a type test (`*.spec-d.ts`): these files assert
 * with `expectTypeOf`/`assertType` at compile time, run no expectations, and
 * name their blocks after the types under test.
 *
@@ -3689,6 +3848,13 @@ function oxlintStylistic(options = {}) {
 */
 function typeTestRules(prefix) {
 	return {
+		...prefix === "vitest" ? {
+			"flawless/prefer-ending-with-an-expect": "off",
+			"vitest/consistent-test-filename": ["error", {
+				allTestPattern: ".*\\.(test|spec)-d\\.[tj]sx?$",
+				pattern: ".*\\.spec-d\\.[tj]sx?$"
+			}]
+		} : {},
 		[`${prefix}/expect-expect`]: "off",
 		[`${prefix}/prefer-expect-assertions`]: "off",
 		[`${prefix}/prefer-lowercase-title`]: "off"
@@ -3721,6 +3887,7 @@ function jestExtendedRules() {
 */
 function jestRules({ extended = false, isInEditor = false, roblox: isRoblox = true, stylistic = true } = {}) {
 	return {
+		"flawless/prefer-expect-assertions-count": "error",
 		"jest/consistent-test-it": "error",
 		"jest/expect-expect": "warn",
 		"jest/max-expects": "error",
@@ -3772,7 +3939,7 @@ function jestRules({ extended = false, isInEditor = false, roblox: isRoblox = tr
 		"jest/valid-describe-callback": "error",
 		"jest/valid-expect": isRoblox ? "off" : "error",
 		"jest/valid-expect-in-promise": "error",
-		"jest/valid-expect-with-promise": "error",
+		"jest/valid-expect-with-promise": ["error", { checkThenables: true }],
 		"jest/valid-title": ["error", {
 			ignoreTypeOfDescribeName: true,
 			mustMatch: { it: ["^should", "Test title must start with \"should\""] }
@@ -3797,6 +3964,13 @@ function jestRules({ extended = false, isInEditor = false, roblox: isRoblox = tr
 */
 function vitestRules({ extended = false, isInEditor = false, stylistic = true } = {}) {
 	return {
+		"flawless/no-conditional-in-test": ["error", { allowOptionalChaining: false }],
+		"flawless/prefer-ending-with-an-expect": ["warn", { assertFunctionNames: [
+			"expect",
+			"expectTypeOf",
+			"assertType"
+		] }],
+		"flawless/prefer-expect-assertions-count": "warn",
 		"vitest/consistent-each-for": ["error", {
 			describe: "for",
 			it: "for",
@@ -3816,7 +3990,6 @@ function vitestRules({ extended = false, isInEditor = false, stylistic = true }
 		"vitest/no-alias-methods": "error",
 		"vitest/no-commented-out-tests": "warn",
 		"vitest/no-conditional-expect": "error",
-		"vitest/no-conditional-in-test": "error",
 		"vitest/no-conditional-tests": "error",
 		"vitest/no-disabled-tests": isInEditor ? "off" : "error",
 		"vitest/no-duplicate-hooks": "error",
@@ -4609,7 +4782,11 @@ function isentinel(factoryOptions, ...userConfigs) {
 	}), oxlintFlawless({ stylistic: stylisticOptions }, prettierSettings), oxlintComments({
 		prettierOptions: prettierSettings,
 		stylistic: stylisticOptions
-	}), oxlintDisables({ root: rootGlobs }));
+	}), oxlintDisables({
+		configDirectory: options.configDirectory,
+		root: rootGlobs,
+		workspaceRoot: findWorkspaceRootSync()
+	}));
 	if (stylisticOptions !== false && formatters !== false) {
 		const oxfmtConfigOptions = resolveOxfmtConfigOptionsSync();
 		configs.push(oxlintOxfmt({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "6.0.0-beta.21",
+  "version": "6.0.0-beta.23",
   "description": "iSentinel's ESLint config",
   "keywords": [
     "eslint-config",
@@ -53,7 +53,7 @@
     "dist"
   ],
   "dependencies": {
-    "@antfu/install-pkg": "1.1.0",
+    "@antfu/install-pkg": "2.0.1",
     "@clack/prompts": "1.7.0",
     "@cspell/eslint-plugin": "10.0.1",
     "@e18e/eslint-plugin": "0.5.1",
@@ -64,8 +64,8 @@
     "@oxlint/plugins": "1.74.0",
     "@pobammer-ts/small-rules": "2.7.0",
     "@stylistic/eslint-plugin": "5.10.0",
-    "@typescript-eslint/eslint-plugin": "8.64.0",
-    "@typescript-eslint/parser": "8.64.0",
+    "@typescript-eslint/eslint-plugin": "8.65.0",
+    "@typescript-eslint/parser": "8.65.0",
     "ansis": "4.3.1",
     "concurrently": "10.0.3",
     "eslint-config-flat-gitignore": "2.3.0",
@@ -76,15 +76,15 @@
     "eslint-plugin-better-max-params": "1.0.0",
     "eslint-plugin-comment-length": "2.3.1",
     "eslint-plugin-de-morgan": "2.1.3",
-    "eslint-plugin-flawless": "1.2.1",
+    "eslint-plugin-flawless": "1.4.1",
     "eslint-plugin-format-lua": "2.0.0",
     "eslint-plugin-import-lite": "0.6.0",
-    "eslint-plugin-jsdoc": "63.1.0",
+    "eslint-plugin-jsdoc": "63.2.0",
     "eslint-plugin-jsonc": "3.3.0",
     "eslint-plugin-oxfmt": "0.14.0",
     "eslint-plugin-package-json": "1.6.0",
     "eslint-plugin-perfectionist": "5.10.0",
-    "eslint-plugin-pnpm": "1.6.1",
+    "eslint-plugin-pnpm": "1.7.0",
     "eslint-plugin-promise": "7.3.0",
     "eslint-plugin-roblox-ts": "1.4.1",
     "eslint-plugin-sentinel": "0.1.2",
@@ -101,15 +101,16 @@
     "oxfmt": "0.59.0",
     "oxlint-plugin-eslint": "1.74.0",
     "oxlint-plugin-oxlint-comments": "0.1.0",
-    "prettier": "3.9.5",
+    "prettier": "3.9.6",
     "semver": "7.8.5",
     "toml-eslint-parser": "1.0.3",
+    "type-fest": "5.8.0",
     "yaml-eslint-parser": "2.1.0",
     "yargs": "18.0.0"
   },
   "devDependencies": {
     "@antfu/ni": "30.2.0",
-    "@eslint-react/shared": "5.17.2",
+    "@eslint-react/shared": "5.17.3",
     "@eslint/config-inspector": "3.1.0",
     "@isentinel/tsconfig": "1.2.0",
     "@stylistic/eslint-plugin-migrate": "4.4.1",
@@ -119,30 +120,29 @@
     "@types/semver": "7.7.1",
     "@types/yargs": "17.0.35",
     "@vitest/eslint-plugin": "1.6.23",
-    "bumpp": "11.1.0",
+    "bumpp": "12.0.0",
     "eslint": "10.7.0",
     "eslint-plugin-erasable-syntax-only": "0.4.2",
     "eslint-plugin-eslint-plugin": "7.5.0",
-    "eslint-plugin-jest": "29.15.4",
+    "eslint-plugin-jest": "29.16.0",
     "eslint-plugin-jest-extended": "3.0.1",
     "eslint-plugin-n": "18.2.2",
-    "eslint-plugin-react-jsx": "5.17.2",
-    "eslint-plugin-react-naming-convention": "5.17.2",
-    "eslint-plugin-react-x": "5.17.2",
+    "eslint-plugin-react-jsx": "5.17.3",
+    "eslint-plugin-react-naming-convention": "5.17.3",
+    "eslint-plugin-react-x": "5.17.3",
     "eslint-typegen": "2.3.1",
     "jiti": "2.7.0",
     "oxlint": "1.74.0",
     "oxlint-tsgolint": "0.25.0",
     "parse-gitignore-ts": "1.0.0",
     "picomatch": "4.0.5",
-    "pnpm-workspace-yaml": "1.6.1",
+    "pnpm-workspace-yaml": "1.7.0",
     "publint": "0.3.21",
-    "tsdown": "0.22.11",
-    "type-fest": "5.8.0",
+    "tsdown": "0.22.12",
     "typescript": "6.0.3",
     "unplugin-unused": "0.5.7",
     "vitest": "4.1.10",
-    "@isentinel/eslint-config": "6.0.0-beta.21"
+    "@isentinel/eslint-config": "6.0.0-beta.23"
   },
   "peerDependencies": {
     "@vitest/eslint-plugin": "^1.6.4",
@@ -198,13 +198,14 @@
   "scripts": {
     "build": "nr gen && tsdown && node scripts/check-dist.ts",
     "build:inspector": "pnpm build && pnpm dlx @eslint/config-inspector build --config eslint-inspector.config.ts --out-dir ./.eslint-config-inspector",
+    "check:extensions": "node scripts/check-package-extensions.ts && node scripts/gen-package-extensions.ts --check",
+    "check:published": "node scripts/check-published-extensions.ts",
     "dev": "npx @eslint/config-inspector --config eslint-inspector.config.ts",
-    "gen": "node scripts/typegen.ts && node scripts/typegen-oxlint.ts && node scripts/typegen-defaults.ts && node scripts/typegen-defaults-oxlint.ts && node scripts/versiongen.ts",
+    "gen": "node scripts/typegen.ts && node scripts/typegen-oxlint.ts && node scripts/typegen-defaults.ts && node scripts/typegen-defaults-oxlint.ts && node scripts/versiongen.ts && node scripts/gen-package-extensions.ts",
     "postgen": "echo 'Generation complete!'",
-    "lint": "concurrently 'oxlint' 'eslint --cache'",
-    "lint:ci": "concurrently 'oxlint' 'eslint --cache --cache-strategy content'",
+    "lint": "isentinel-lint",
     "oxlint": "oxlint",
-    "release": "bumpp",
+    "release": "bumpp -r",
     "stub": "tsdown",
     "test": "nr gen && vitest run",
     "test:watch": "vitest",