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

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",
@@ -3680,7 +3682,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 +3691,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 +3730,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",
@@ -3797,6 +3807,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 +3833,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "6.0.0-beta.21",
+  "version": "6.0.0-beta.22",
   "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.0",
     "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,7 +101,7 @@
     "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",
     "yaml-eslint-parser": "2.1.0",
@@ -109,7 +109,7 @@
   },
   "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 +119,30 @@
     "@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.15.5",
     "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",
+    "tsdown": "0.22.12",
     "type-fest": "5.8.0",
     "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.22"
   },
   "peerDependencies": {
     "@vitest/eslint-plugin": "^1.6.4",
@@ -201,8 +201,7 @@
     "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",
     "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",
     "stub": "tsdown",