@isentinel/eslint-config 5.0.0-beta.1 → 5.0.0-beta.2

package/README.md

@@ -365,8 +365,8 @@ content:
 ```yaml
 # cspell.config.yaml
 words:
-    - isentinel
-    - isverycool
+  - isentinel
+  - isverycool
 ```
 
 To disable this, you can set the `spellCheck` option to `false`:

package/dist/index.d.mts

@@ -46,14 +46,12 @@ interface FlatGitignoreOptions {
   cwd?: string;
 }
 //#endregion
-//#region src/configs/prettier.d.ts
-type PrettierRuleOptions = Pick<Partial<Options>, "parser"> & Options & Record<string, unknown>;
-declare function prettier(options?: OptionsComponentExtensions & OptionsFiles & OptionsOverrides & OptionsTypeScriptParserOptions & {
+//#region src/configs/oxfmt.d.ts
+declare function oxfmt(options?: OptionsComponentExtensions & OptionsFiles & OptionsOverrides & {
   formatters?: OptionsFormatters | true;
-  jsFormatter?: FormatterEngine;
+  oxfmtConfigOptions?: FormatOptions;
+  oxfmtOptions?: FormatOptions;
   prettierOptions?: Options;
-  stylistic?: StylisticConfig;
-  tsFormatter?: FormatterEngine;
 }): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
 //#region src/typegen.d.ts
@@ -833,10 +831,6 @@ interface RuleOptions {
    * Use stylua to format lua files
    */
   'format-lua/stylua'?: Linter.RuleEntry<FormatLuaStylua>;
-  /**
-   * @see https://github.com/prettier/eslint-plugin-prettier#options
-   */
-  'format/prettier'?: Linter.RuleEntry<FormatPrettier>;
   /**
    * Require or disallow spacing between function identifiers and their invocations
    * @see https://eslint.org/docs/latest/rules/func-call-spacing
@@ -9731,16 +9725,6 @@ type FormatLuaStylua = [] | [{
     [k: string]: unknown | undefined;
   };
   [k: string]: unknown | undefined;
-}]; // ----- format/prettier -----
-type FormatPrettier = [] | [{
-  [k: string]: unknown | undefined;
-}] | [{
-  [k: string]: unknown | undefined;
-}, {
-  usePrettierrc?: boolean;
-  fileInfoOptions?: {
-    [k: string]: unknown | undefined;
-  };
 }]; // ----- func-call-spacing -----
 type FuncCallSpacing = ([] | ["never"] | [] | ["always"] | ["always", {
   allowNewlines?: boolean;
@@ -17590,7 +17574,7 @@ type Yoda = [] | [("always" | "never")] | [("always" | "never"), {
   exceptRange?: boolean;
   onlyEquality?: boolean;
 }]; // Names of all the configs
-type ConfigNames = 'isentinel/cease-nonsense' | 'isentinel/eslint/comments' | 'isentinel/eslint/comments/src' | 'isentinel/eslint-plugin/setup' | 'isentinel/eslint-plugin/rules' | 'isentinel/flawless/setup' | 'isentinel/flawless/ts/rules-type-aware' | 'isentinel/flawless/tsx/rules-type-aware' | 'isentinel/gitignore' | 'isentinel/ignores' | 'isentinel/imports/rules' | 'isentinel/imports/game' | 'isentinel/javascript/setup' | 'isentinel/javascript/rules' | 'isentinel/jsdoc/setup' | 'isentinel/jsdoc' | 'isentinel/jsonc/setup' | 'isentinel/jsonc/rules' | 'isentinel/markdown/setup' | 'isentinel/markdown/processor' | 'isentinel/markdown/parser' | 'isentinel/markdown/disables' | 'isentinel/node/rules' | 'isentinel/oxfmt/setup' | 'isentinel/oxfmt/javascript' | 'isentinel/oxfmt/typescript' | 'isentinel/package-json/setup' | 'isentinel/package-json' | 'isentinel/perfectionist/setup' | 'isentinel/perfectionist' | 'isentinel/perfectionist/jsx' | 'isentinel/pnpm/setup' | 'isentinel/pnpm/package-json' | 'isentinel/pnpm/pnpm-workspace-yaml' | 'isentinel/prettier/setup' | 'isentinel/prettier/css' | 'isentinel/prettier/scss' | 'isentinel/prettier/less' | 'isentinel/prettier/html' | 'isentinel/prettier/markdown' | 'isentinel/prettier/graphql' | 'isentinel/prettier/json' | 'isentinel/prettier/yaml' | 'isentinel/promise' | 'isentinel/react/setup' | 'isentinel/react/setup/naming' | 'isentinel/react/rules' | 'isentinel/react/type-aware-rules' | 'isentinel/roblox/setup' | 'isentinel/roblox/parser' | 'isentinel/roblox/type-aware-parser' | 'isentinel/roblox' | 'isentinel/roblox/rules-type-aware' | 'isentinel/roblox/format-lua/setup' | 'isentinel/roblox/format-lua' | 'isentinel/sonarjs' | 'isentinel/spelling/setup' | 'isentinel/spelling' | 'isentinel/stylistic/setup' | 'isentinel/stylistic' | 'isentinel/stylistic/ts' | 'isentinel/stylistic/js' | 'isentinel/stylistic/markdown-code' | 'isentinel/test/jest/setup' | 'isentinel/test/jest/rules' | 'isentinel/test/vitest/setup' | 'isentinel/test/vitest/rules' | 'isentinel/toml/setup' | 'isentinel/toml/rules' | 'isentinel/typescript/setup' | 'isentinel/typescript/parser' | 'isentinel/typescript/type-aware-parser' | 'isentinel/typescript/rules' | 'isentinel/typescript/rules-type-aware' | 'isentinel/typescript/erasable-syntax-only' | 'isentinel/unicorn' | 'isentinel/unicorn/root' | 'isentinel/yaml/setup' | 'isentinel/yaml/rules';
+type ConfigNames = 'isentinel/cease-nonsense' | 'isentinel/eslint/comments' | 'isentinel/eslint/comments/src' | 'isentinel/eslint-plugin/setup' | 'isentinel/eslint-plugin/rules' | 'isentinel/flawless/setup' | 'isentinel/flawless/ts/rules-type-aware' | 'isentinel/flawless/tsx/rules-type-aware' | 'isentinel/gitignore' | 'isentinel/ignores' | 'isentinel/imports/rules' | 'isentinel/imports/game' | 'isentinel/javascript/setup' | 'isentinel/javascript/rules' | 'isentinel/jsdoc/setup' | 'isentinel/jsdoc' | 'isentinel/jsonc/setup' | 'isentinel/jsonc/rules' | 'isentinel/markdown/setup' | 'isentinel/markdown/processor' | 'isentinel/markdown/parser' | 'isentinel/markdown/disables' | 'isentinel/node/rules' | 'isentinel/oxfmt/setup' | 'isentinel/oxfmt/javascript' | 'isentinel/oxfmt/typescript' | 'isentinel/oxfmt/css' | 'isentinel/oxfmt/scss' | 'isentinel/oxfmt/less' | 'isentinel/oxfmt/html' | 'isentinel/oxfmt/markdown' | 'isentinel/oxfmt/graphql' | 'isentinel/oxfmt/json' | 'isentinel/oxfmt/yaml' | 'isentinel/package-json/setup' | 'isentinel/package-json' | 'isentinel/perfectionist/setup' | 'isentinel/perfectionist' | 'isentinel/perfectionist/jsx' | 'isentinel/pnpm/setup' | 'isentinel/pnpm/package-json' | 'isentinel/pnpm/pnpm-workspace-yaml' | 'isentinel/promise' | 'isentinel/react/setup' | 'isentinel/react/setup/naming' | 'isentinel/react/rules' | 'isentinel/react/type-aware-rules' | 'isentinel/roblox/setup' | 'isentinel/roblox/parser' | 'isentinel/roblox/type-aware-parser' | 'isentinel/roblox' | 'isentinel/roblox/rules-type-aware' | 'isentinel/roblox/format-lua/setup' | 'isentinel/roblox/format-lua' | 'isentinel/sonarjs' | 'isentinel/spelling/setup' | 'isentinel/spelling' | 'isentinel/stylistic/setup' | 'isentinel/stylistic' | 'isentinel/stylistic/ts' | 'isentinel/stylistic/js' | 'isentinel/stylistic/markdown-code' | 'isentinel/test/jest/setup' | 'isentinel/test/jest/rules' | 'isentinel/test/vitest/setup' | 'isentinel/test/vitest/rules' | 'isentinel/toml/setup' | 'isentinel/toml/rules' | 'isentinel/typescript/setup' | 'isentinel/typescript/parser' | 'isentinel/typescript/type-aware-parser' | 'isentinel/typescript/rules' | 'isentinel/typescript/rules-type-aware' | 'isentinel/typescript/erasable-syntax-only' | 'isentinel/unicorn' | 'isentinel/unicorn/root' | 'isentinel/yaml/setup' | 'isentinel/yaml/rules';
 //#endregion
 //#region src/utils.d.ts
 type ExtractRuleOptions<T> = T extends Linter.RuleEntry<infer U> ? U : never;
@@ -17652,7 +17636,6 @@ interface OptionsFilesTypeAware extends OptionsFiles {
    */
   ignoresTypeAware?: Array<string>;
 }
-type FormatterEngine = "oxfmt" | "prettier";
 interface OptionsFormatters {
   /**
    * Enable formatting support for CSS, Less, Sass, and SCSS.
@@ -17672,12 +17655,6 @@ interface OptionsFormatters {
    * @default true
    */
   html?: boolean;
-  /**
-   * Formatter engine for JavaScript files.
-   *
-   * @default "oxfmt"
-   */
-  javascript?: FormatterEngine;
   /**
    * Enable formatting support for JSON(C|5).
    *
@@ -17704,15 +17681,10 @@ interface OptionsFormatters {
   /**
    * Custom options for Prettier.
    *
-   * By default it's controlled by our own config.
+   * Used for arrow-return-style-x and as a migration source for oxfmt
+   * options.
    */
   prettierOptions?: PrettierOptions;
-  /**
-   * Formatter engine for TypeScript files.
-   *
-   * @default "oxfmt"
-   */
-  typescript?: FormatterEngine;
   /**
    * Enable formatting support for YAML.
    *
@@ -18130,15 +18102,6 @@ declare function markdown(options?: OptionsComponentExtensions & OptionsFiles &
 //#region src/configs/node.d.ts
 declare function node(): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
-//#region src/configs/oxfmt.d.ts
-declare function oxfmt(options?: OptionsComponentExtensions & OptionsFiles & OptionsOverrides & {
-  jsFormatter?: FormatterEngine;
-  oxfmtConfigOptions?: FormatOptions;
-  oxfmtOptions?: FormatOptions;
-  prettierOptions?: PrettierOptions;
-  tsFormatter?: FormatterEngine;
-}): Promise<Array<TypedFlatConfigItem>>;
-//#endregion
 //#region src/configs/package-json.d.ts
 declare function packageJson(options?: OptionsHasRoblox & OptionsProjectType & OptionsStylistic): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
@@ -18282,4 +18245,4 @@ declare const GLOB_BUILD_TOOLS: Array<string>;
 declare const GLOB_ALL_SRC: string[];
 declare const GLOB_EXCLUDE: string[];
 //#endregion
-export { Awaitable, type ConfigNames, type FlatConfigComposer, FormatterEngine, GLOB_ALL_JSON, GLOB_ALL_SRC, GLOB_BUILD_TOOLS, GLOB_CSS, GLOB_DTS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LUA, GLOB_MARKDOWN, GLOB_MARKDOWN_BLOCKS, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_ROOT, GLOB_ROOT_SRC, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_XML, GLOB_YAML, GitignoreOptions, JsdocOptions, NamedFlatConfigItem, NamedOptionsConfig, OptionsComponentExtensions, OptionsConfig, OptionsFiles, OptionsFilesTypeAware, OptionsFormatters, OptionsHasRoblox, OptionsHasTypeScript, OptionsIsInEditor, OptionsJest, OptionsOverrides, OptionsOverridesTypeAware, OptionsPnpm, OptionsProjectType, OptionsStylistic, OptionsTestFramework, OptionsTypeScriptErasableOnly, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes, OptionsTypescript, OptionsVitest, type OxfmtOptions, PerfectionistConfig, type PrettierOptions, PrettierRuleOptions, ReactConfig, Rules, SpellCheckConfig, StylisticConfig, StylisticConfigDefaults, TypedFlatConfigItem, ceaseNonsense, comments, isentinel as default, isentinel, defaultPluginRenaming, disables, eslintPlugin, flawless, gitignore, ignores, imports, javascript, jsdoc, jsonc, markdown, node, oxfmt, packageJson, perfectionist, pnpm, prettier, promise, react, roblox, sonarjs, sortGithubAction, sortPnpmWorkspace, sortRojoProject, sortTsconfig, spelling, stylistic, test, toml, typescript, unicorn, yaml };
+export { Awaitable, type ConfigNames, type FlatConfigComposer, GLOB_ALL_JSON, GLOB_ALL_SRC, GLOB_BUILD_TOOLS, GLOB_CSS, GLOB_DTS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LUA, GLOB_MARKDOWN, GLOB_MARKDOWN_BLOCKS, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_ROOT, GLOB_ROOT_SRC, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_XML, GLOB_YAML, GitignoreOptions, JsdocOptions, NamedFlatConfigItem, NamedOptionsConfig, OptionsComponentExtensions, OptionsConfig, OptionsFiles, OptionsFilesTypeAware, OptionsFormatters, OptionsHasRoblox, OptionsHasTypeScript, OptionsIsInEditor, OptionsJest, OptionsOverrides, OptionsOverridesTypeAware, OptionsPnpm, OptionsProjectType, OptionsStylistic, OptionsTestFramework, OptionsTypeScriptErasableOnly, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes, OptionsTypescript, OptionsVitest, type OxfmtOptions, PerfectionistConfig, type PrettierOptions, ReactConfig, Rules, SpellCheckConfig, StylisticConfig, StylisticConfigDefaults, TypedFlatConfigItem, ceaseNonsense, comments, isentinel as default, isentinel, defaultPluginRenaming, disables, eslintPlugin, flawless, gitignore, ignores, imports, javascript, jsdoc, jsonc, markdown, node, oxfmt, packageJson, perfectionist, pnpm, promise, react, roblox, sonarjs, sortGithubAction, sortPnpmWorkspace, sortRojoProject, sortTsconfig, spelling, stylistic, test, toml, typescript, unicorn, yaml };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { isPackageExists } from "local-pkg";
 import fs from "node:fs";
 import path, { dirname, join, relative, resolve } from "node:path";
 import process from "node:process";
-import prettier$1 from "prettier";
+import prettier from "prettier";
 import { findUp, findUpSync } from "find-up-simple";
 import { convertIgnorePatternToMinimatch } from "@eslint/compat";
 import fs$1 from "node:fs/promises";
@@ -187,13 +187,6 @@ function mergeGlobs(globs, additionalPatterns) {
 	} else result.push(pattern);
 	return result;
 }
-function mergePrettierOptions(options, overrides = {}) {
-	return {
-		...options,
-		...overrides,
-		plugins: [...overrides.plugins ?? [], ...options.plugins ?? []]
-	};
-}
 /**
 * Rename plugin prefixes in a rule object. Accepts a map of prefixes to rename.
 *
@@ -232,7 +225,7 @@ function renameRules(rules, map) {
 */
 async function resolvePrettierConfigOptions() {
 	try {
-		return await prettier$1.resolveConfig("package.json", { editorconfig: true }) ?? {};
+		return await prettier.resolveConfig("package.json", { editorconfig: true }) ?? {};
 	} catch {
 		return {};
 	}
@@ -247,7 +240,7 @@ async function resolveOxfmtConfigOptions() {
 	for (const filename of OXFMT_CONFIG_FILES) {
 		const configPath = path.resolve(process.cwd(), filename);
 		try {
-			const content = fs.readFileSync(configPath, "utf-8");
+			const content = await fs.promises.readFile(configPath, "utf-8");
 			return JSON.parse(content);
 		} catch {
 			continue;
@@ -256,17 +249,6 @@ async function resolveOxfmtConfigOptions() {
 	return {};
 }
 /**
-* Check if a feature should be enabled based on options. Handles the pattern
-* where features can be disabled globally or individually.
-*
-* @template T - The type of the options object.
-* @template K - The key type within the options object.
-* @param options - The options object (true | false | undefined | object).
-* @param key - The key to check within the options object.
-* @param defaultValue - Default value when key is not specified.
-* @returns Whether the feature should be enabled.
-*/
-/**
 * Override the severity of all rules in a rules object, preserving rule
 * options. Rules set to `"off"` are not affected.
 *
@@ -398,7 +380,7 @@ const GLOB_EXCLUDE = [
 	"**/.cache",
 	"**/.changeset",
 	"**/.agents",
-	"**/.claude",
+	"**/.claude/**/*",
 	"**/.gemini",
 	"**/.kilocode",
 	"**/.opencode",
@@ -462,8 +444,8 @@ async function comments(options = {}) {
 		name: "isentinel/eslint/comments/src",
 		files: [GLOB_SRC],
 		rules: { "comment-length/limit-single-line-comments": ["error", {
-			maxLength: Number(prettierOptions["jsdocPrintWidth"]) + 2,
-			tabSize: prettierOptions.tabWidth
+			maxLength: (Number(prettierOptions["jsdocPrintWidth"]) || 80) + 2,
+			tabSize: prettierOptions.tabWidth ?? 4
 		}] }
 	}] : []];
 }
@@ -531,6 +513,7 @@ async function disables(options) {
 				"max-lines-per-function": "off",
 				"no-empty-function": "off",
 				"no-unused-expressions": "off",
+				"sonar/no-duplicate-string": "off",
 				"ts/explicit-function-return-type": "off",
 				"ts/no-empty-function": "off",
 				"ts/no-non-null-assertion": "off",
@@ -1726,7 +1709,7 @@ const defaultPluginRenaming = {
 	"yml": "yaml"
 };
 async function isentinel(options, ...userConfigs) {
-	const { autoRenamePlugins = true, componentExts: componentExtensions = [], eslintPlugin: enableEslintPlugin = false, formatters, gitignore: enableGitignore = true, jsdoc: enableJsdoc = true, jsx: enableJsx = true, pnpm: enableCatalogs = findUpSync("pnpm-workspace.yaml") !== void 0, react: enableReact = false, root: customRootGlobs, spellCheck: enableSpellCheck, typescript: enableTypeScript } = options;
+	const { autoRenamePlugins = true, componentExts: componentExtensions = [], eslintPlugin: enableEslintPlugin = false, formatters, gitignore: enableGitignore = true, jsdoc: enableJsdoc = true, jsx: enableJsx = true, pnpm: enableCatalogs = findUpSync("pnpm-workspace.yaml") !== void 0, react: enableReact = false, root: customRootGlobs, spellCheck: enableSpellCheck } = options;
 	const rootGlobs = mergeGlobs(GLOB_ROOT, customRootGlobs);
 	const enableRoblox = options.roblox !== false;
 	let { defaultSeverity, isInEditor } = options;
@@ -1747,24 +1730,17 @@ async function isentinel(options, ...userConfigs) {
 	})();
 	if (stylisticOptions !== false && !("jsx" in stylisticOptions)) stylisticOptions.jsx = enableJsx;
 	const formatterOptions = typeof options.formatters === "object" ? options.formatters : {};
-	const jsFormatter = formatterOptions.javascript ?? "oxfmt";
-	const tsFormatter = formatterOptions.typescript ?? "oxfmt";
-	const useOxfmt = options.formatters !== false && (jsFormatter === "oxfmt" || tsFormatter === "oxfmt");
 	const prettierOptions = formatterOptions.prettierOptions ?? {};
 	const editorConfigOptions = await resolvePrettierConfigOptions();
-	const oxfmtConfigOptions = useOxfmt ? await resolveOxfmtConfigOptions() : {};
+	const oxfmtConfigOptions = options.formatters !== false ? await resolveOxfmtConfigOptions() : {};
 	const prettierSettings = Object.assign({
 		arrowParens: "always",
-		jsdocPreferCodeFences: true,
-		jsdocPrintWidth: 80,
-		plugins: [require$1.resolve("prettier-plugin-jsdoc")],
 		printWidth: 100,
 		quoteProps: "consistent",
 		semi: true,
 		singleQuote: false,
 		tabWidth: 4,
 		trailingComma: "all",
-		tsdoc: true,
 		useTabs: true
 	}, editorConfigOptions, prettierOptions);
 	const configs = [];
@@ -1871,26 +1847,20 @@ async function isentinel(options, ...userConfigs) {
 		isInEditor
 	}));
 	configs.push(disables({ root: rootGlobs }));
-	if (stylisticOptions !== false) {
-		configs.push(prettier({
-			...resolveWithDefaults(enableTypeScript, {}),
-			...getOverrides(options, "typescript"),
-			componentExts: componentExtensions,
-			formatters: formatters !== false ? formatters : void 0,
-			jsFormatter,
-			prettierOptions: prettierSettings,
-			stylistic: stylisticOptions,
-			tsFormatter
-		}));
-		if (useOxfmt) configs.push(oxfmt({
-			componentExts: componentExtensions,
-			jsFormatter,
-			oxfmtConfigOptions,
-			oxfmtOptions: formatterOptions.oxfmtOptions,
-			prettierOptions: prettierSettings,
-			tsFormatter
-		}));
-	}
+	if (stylisticOptions !== false) configs.push(oxfmt({
+		componentExts: componentExtensions,
+		formatters: formatters !== false ? formatters : {
+			css: false,
+			graphql: false,
+			html: false,
+			json: false,
+			markdown: false,
+			yaml: false
+		},
+		oxfmtConfigOptions,
+		oxfmtOptions: formatterOptions.oxfmtOptions,
+		prettierOptions: prettierSettings
+	}));
 	if ("files" in options) throw new Error("[@isentinel/eslint-config] The first argument should not contain the \"files\" property as the options are supposed to be global. Place it in the second or later config instead.");
 	const fusedConfig = flatConfigProps.reduce((accumulator, key) => {
 		if (key in options) accumulator[key] = options[key];
@@ -1920,7 +1890,16 @@ async function isentinel(options, ...userConfigs) {
 //#endregion
 //#region src/configs/oxfmt.ts
 async function oxfmt(options) {
-	const { componentExts: componentExtensions = [], files: oxfmtFiles, jsFormatter = "oxfmt", oxfmtConfigOptions = {}, oxfmtOptions: userOxfmtOptions, prettierOptions = {}, tsFormatter = "oxfmt" } = options ?? {};
+	const { componentExts: componentExtensions = [], files: oxfmtFiles, formatters = {}, oxfmtConfigOptions = {}, oxfmtOptions: userOxfmtOptions, prettierOptions = {} } = options ?? {};
+	const formattingOptions = {
+		css: true,
+		graphql: true,
+		html: true,
+		json: true,
+		markdown: true,
+		yaml: true,
+		...resolveWithDefaults(formatters, {})
+	};
 	const oxfmtOptions = {
 		sortImports: {
 			customGroups: [{
@@ -1953,6 +1932,7 @@ async function oxfmt(options) {
 			],
 			newlinesBetween: true
 		},
+		sortPackageJson: false,
 		...migratePrettierOptions(prettierOptions),
 		...oxfmtConfigOptions,
 		...userOxfmtOptions
@@ -1965,45 +1945,90 @@ async function oxfmt(options) {
 		name: "isentinel/oxfmt/setup",
 		plugins: { oxfmt: pluginOxfmt }
 	}];
-	if (jsFormatter === "oxfmt") {
-		const jsFiles = oxfmtFiles ?? [
-			GLOB_JS,
-			GLOB_JSX,
-			`${GLOB_MARKDOWN}/${GLOB_JS}`,
-			`${GLOB_MARKDOWN}/${GLOB_JSX}`
-		];
-		configs.push({
-			name: "isentinel/oxfmt/javascript",
-			files: jsFiles,
-			rules: {
-				...rules,
-				"arrow-body-style": "off",
-				"format/prettier": "off",
-				"oxfmt/oxfmt": ["error", oxfmtOptions],
-				"prefer-arrow-callback": "off"
-			}
-		});
-	}
-	if (tsFormatter === "oxfmt") {
-		const tsFiles = oxfmtFiles ?? [
-			GLOB_TS,
-			GLOB_TSX,
-			`${GLOB_MARKDOWN}/${GLOB_TS}`,
-			`${GLOB_MARKDOWN}/${GLOB_TSX}`,
-			...componentExtensions.map((extension) => `**/*.${extension}`)
-		];
-		configs.push({
-			name: "isentinel/oxfmt/typescript",
-			files: tsFiles,
-			rules: {
-				...rules,
-				"arrow-body-style": "off",
-				"format/prettier": "off",
-				"oxfmt/oxfmt": ["error", oxfmtOptions],
-				"prefer-arrow-callback": "off"
-			}
-		});
-	}
+	const jsFiles = oxfmtFiles ?? [
+		GLOB_JS,
+		GLOB_JSX,
+		`${GLOB_MARKDOWN}/${GLOB_JS}`,
+		`${GLOB_MARKDOWN}/${GLOB_JSX}`
+	];
+	configs.push({
+		name: "isentinel/oxfmt/javascript",
+		files: jsFiles,
+		rules: {
+			...rules,
+			"arrow-body-style": "off",
+			"oxfmt/oxfmt": ["error", oxfmtOptions],
+			"prefer-arrow-callback": "off"
+		}
+	});
+	const tsFiles = oxfmtFiles ?? [
+		GLOB_TS,
+		GLOB_TSX,
+		`${GLOB_MARKDOWN}/${GLOB_TS}`,
+		`${GLOB_MARKDOWN}/${GLOB_TSX}`,
+		...componentExtensions.map((extension) => `**/*.${extension}`)
+	];
+	configs.push({
+		name: "isentinel/oxfmt/typescript",
+		files: tsFiles,
+		rules: {
+			...rules,
+			"arrow-body-style": "off",
+			"oxfmt/oxfmt": ["error", oxfmtOptions],
+			"prefer-arrow-callback": "off"
+		}
+	});
+	if (formattingOptions.css) configs.push({
+		name: "isentinel/oxfmt/css",
+		files: [GLOB_CSS, GLOB_POSTCSS],
+		languageOptions: { parser: parserPlain },
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	}, {
+		name: "isentinel/oxfmt/scss",
+		files: [GLOB_SCSS],
+		languageOptions: { parser: parserPlain },
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	}, {
+		name: "isentinel/oxfmt/less",
+		files: [GLOB_LESS],
+		languageOptions: { parser: parserPlain },
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	});
+	if (formattingOptions.html) configs.push({
+		name: "isentinel/oxfmt/html",
+		files: ["**/*.html"],
+		languageOptions: { parser: parserPlain },
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	});
+	if (formattingOptions.markdown) configs.push({
+		name: "isentinel/oxfmt/markdown",
+		files: [GLOB_MARKDOWN],
+		rules: { "oxfmt/oxfmt": ["error", {
+			...oxfmtOptions,
+			printWidth: Number(prettierOptions["jsdocPrintWidth"]) || 80,
+			proseWrap: "always"
+		}] }
+	});
+	if (formattingOptions.graphql) configs.push({
+		name: "isentinel/oxfmt/graphql",
+		files: ["**/*.graphql"],
+		languageOptions: { parser: parserPlain },
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	});
+	if (formattingOptions.json) configs.push({
+		name: "isentinel/oxfmt/json",
+		files: [GLOB_ALL_JSON],
+		rules: { "oxfmt/oxfmt": ["error", oxfmtOptions] }
+	});
+	if (formattingOptions.yaml) configs.push({
+		name: "isentinel/oxfmt/yaml",
+		files: [GLOB_YAML],
+		rules: { "oxfmt/oxfmt": ["error", {
+			...oxfmtOptions,
+			tabWidth: 2,
+			useTabs: false
+		}] }
+	});
 	return configs;
 }
 const UNSUPPORTED_PRETTIER_KEYS = new Set([
@@ -2260,119 +2285,6 @@ async function detectCatalogUsage() {
 	return yaml.includes("catalog:") || yaml.includes("catalogs:");
 }
 
-//#endregion
-//#region src/configs/prettier.ts
-async function prettier(options) {
-	const { componentExts: componentExtensions = [], files: prettierFiles, formatters = {}, jsFormatter = "oxfmt", prettierOptions = {}, tsFormatter = "oxfmt" } = options ?? {};
-	const formattingOptions = {
-		css: true,
-		graphql: true,
-		html: true,
-		json: true,
-		markdown: true,
-		yaml: true,
-		...resolveWithDefaults(formatters, {})
-	};
-	const [configPrettier, pluginPrettier] = await Promise.all([interopDefault(import("eslint-config-prettier/flat")), interopDefault(import("eslint-plugin-prettier"))]);
-	const rulesToIgnore = ["curly", "style/quotes"];
-	const rules = renameRules(configPrettier.rules, defaultPluginRenaming);
-	for (const rule of rulesToIgnore) delete rules[rule];
-	const configs = [{
-		name: "isentinel/prettier/setup",
-		plugins: { format: pluginPrettier }
-	}];
-	if (jsFormatter === "prettier") {
-		const jsFiles = prettierFiles ?? [
-			GLOB_JS,
-			GLOB_JSX,
-			`${GLOB_MARKDOWN}/${GLOB_JS}`,
-			`${GLOB_MARKDOWN}/${GLOB_JSX}`
-		];
-		configs.push({
-			name: "isentinel/prettier/javascript",
-			files: jsFiles,
-			rules: {
-				...rules,
-				"arrow-body-style": "off",
-				"format/prettier": ["error", mergePrettierOptions(prettierOptions, {})],
-				"prefer-arrow-callback": "off"
-			}
-		});
-	}
-	if (tsFormatter === "prettier") {
-		const tsFiles = prettierFiles ?? [
-			GLOB_TS,
-			GLOB_TSX,
-			`${GLOB_MARKDOWN}/${GLOB_TS}`,
-			`${GLOB_MARKDOWN}/${GLOB_TSX}`,
-			...componentExtensions.map((extension) => `**/*.${extension}`)
-		];
-		configs.push({
-			name: "isentinel/prettier/typescript",
-			files: tsFiles,
-			rules: {
-				...rules,
-				"arrow-body-style": "off",
-				"format/prettier": ["error", mergePrettierOptions(prettierOptions, {})],
-				"prefer-arrow-callback": "off"
-			}
-		});
-	}
-	if (formattingOptions.css) configs.push({
-		name: "isentinel/prettier/css",
-		files: [GLOB_CSS, GLOB_POSTCSS],
-		languageOptions: { parser: parserPlain },
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "css" })] }
-	}, {
-		name: "isentinel/prettier/scss",
-		files: [GLOB_SCSS],
-		languageOptions: { parser: parserPlain },
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "scss" })] }
-	}, {
-		name: "isentinel/prettier/less",
-		files: [GLOB_LESS],
-		languageOptions: { parser: parserPlain },
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "less" })] }
-	});
-	if (formattingOptions.html) configs.push({
-		name: "isentinel/prettier/html",
-		files: ["**/*.html"],
-		languageOptions: { parser: parserPlain },
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "html" })] }
-	});
-	if (formattingOptions.markdown) configs.push({
-		name: "isentinel/prettier/markdown",
-		files: [GLOB_MARKDOWN],
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, {
-			embeddedLanguageFormatting: "auto",
-			parser: "markdown",
-			printWidth: Number(prettierOptions["jsdocPrintWidth"]) || 80,
-			proseWrap: "always"
-		})] }
-	});
-	if (formattingOptions.graphql) configs.push({
-		name: "isentinel/prettier/graphql",
-		files: ["**/*.graphql"],
-		languageOptions: { parser: parserPlain },
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "graphql" })] }
-	});
-	if (formattingOptions.json) configs.push({
-		name: "isentinel/prettier/json",
-		files: [GLOB_ALL_JSON],
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "json" })] }
-	});
-	if (formattingOptions.yaml) configs.push({
-		name: "isentinel/prettier/yaml",
-		files: [GLOB_YAML],
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, {
-			parser: "yaml",
-			tabWidth: 2,
-			useTabs: false
-		})] }
-	});
-	return configs;
-}
-
 //#endregion
 //#region src/configs/promise.ts
 async function promise() {
@@ -3324,7 +3236,7 @@ async function stylistic(options = {}, prettierOptions = {}) {
 			maxObjectProperties: 2,
 			namedExportsAlwaysUseExplicitReturn: true,
 			objectReturnStyle: "complex-explicit",
-			usePrettier: mergePrettierOptions(prettierOptions, {})
+			usePrettier: prettierOptions
 		}] };
 	}
 	return [
@@ -3561,7 +3473,10 @@ async function test(options = {}) {
 				"vitest/no-standalone-expect": "error",
 				"vitest/no-test-prefixes": "error",
 				"vitest/no-test-return-statement": "error",
+				"vitest/no-unneeded-async-expect-function": "error",
 				"vitest/prefer-called-exactly-once-with": "warn",
+				"vitest/prefer-called-once": "error",
+				"vitest/prefer-called-with": "error",
 				"vitest/prefer-comparison-matcher": "warn",
 				"vitest/prefer-describe-function-title": "warn",
 				"vitest/prefer-each": "warn",
@@ -3583,6 +3498,8 @@ async function test(options = {}) {
 				"vitest/prefer-to-be": "error",
 				"vitest/prefer-to-be-object": "error",
 				"vitest/prefer-to-contain": "error",
+				"vitest/prefer-to-have-been-called-times": "error",
+				"vitest/prefer-to-have-length": "error",
 				"vitest/prefer-todo": "warn",
 				"vitest/prefer-vi-mocked": "error",
 				"vitest/require-awaited-expect-poll": "error",
@@ -4004,4 +3921,4 @@ async function yaml(options = {}) {
 }
 
 //#endregion
-export { GLOB_ALL_JSON, GLOB_ALL_SRC, GLOB_BUILD_TOOLS, GLOB_CSS, GLOB_DTS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LUA, GLOB_MARKDOWN, GLOB_MARKDOWN_BLOCKS, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_ROOT, GLOB_ROOT_SRC, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_XML, GLOB_YAML, StylisticConfigDefaults, ceaseNonsense, comments, isentinel as default, isentinel, defaultPluginRenaming, disables, eslintPlugin, flawless, gitignore, ignores, imports, javascript, jsdoc, jsonc, markdown, node, oxfmt, packageJson, perfectionist, pnpm, prettier, promise, react, roblox, sonarjs, sortGithubAction, sortPnpmWorkspace, sortRojoProject, sortTsconfig, spelling, stylistic, test, toml, typescript, unicorn, yaml };
+export { GLOB_ALL_JSON, GLOB_ALL_SRC, GLOB_BUILD_TOOLS, GLOB_CSS, GLOB_DTS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LUA, GLOB_MARKDOWN, GLOB_MARKDOWN_BLOCKS, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_ROOT, GLOB_ROOT_SRC, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_XML, GLOB_YAML, StylisticConfigDefaults, ceaseNonsense, comments, isentinel as default, isentinel, defaultPluginRenaming, disables, eslintPlugin, flawless, gitignore, ignores, imports, javascript, jsdoc, jsonc, markdown, node, oxfmt, packageJson, perfectionist, pnpm, promise, react, roblox, sonarjs, sortGithubAction, sortPnpmWorkspace, sortRojoProject, sortTsconfig, spelling, stylistic, test, toml, typescript, unicorn, yaml };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "iSentinel's ESLint config",
   "keywords": [
     "eslint-config",
@@ -81,7 +81,6 @@
     "eslint-plugin-package-json": "0.89.1",
     "eslint-plugin-perfectionist": "5.6.0",
     "eslint-plugin-pnpm": "1.5.0",
-    "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-promise": "7.2.1",
     "eslint-plugin-roblox-ts": "1.4.0",
     "eslint-plugin-sentinel": "0.1.2",
@@ -96,7 +95,6 @@
     "local-pkg": "1.1.2",
     "oxfmt": "0.35.0",
     "prettier": "3.8.1",
-    "prettier-plugin-jsdoc": "1.8.0",
     "toml-eslint-parser": "1.0.3",
     "yaml-eslint-parser": "2.0.0",
     "yargs": "18.0.0"
@@ -133,7 +131,7 @@
     "type-fest": "5.4.4",
     "typescript": "5.9.3",
     "unplugin-unused": "0.5.7",
-    "@isentinel/eslint-config": "5.0.0-beta.1"
+    "@isentinel/eslint-config": "5.0.0-beta.2"
   },
   "peerDependencies": {
     "@vitest/eslint-plugin": "^1.6.4",