@isentinel/eslint-config 6.0.0-beta.10 → 6.0.0-beta.12

package/dist/index.d.mts

@@ -667,14 +667,6 @@ interface MainRuleDefaults {
   "arrow-spacing": {
     "*": "off";
   };
-  "arrow-style/arrow-return-style": {
-    "*": {
-      "severityOnly": "error";
-    };
-  };
-  "arrow-style/no-export-default-arrow": {
-    "*": "error";
-  };
   "babel/object-curly-spacing": {
     "*": "off";
   };
@@ -852,6 +844,14 @@ interface MainRuleDefaults {
       "ignore": ["eslint-enable"];
     }];
   };
+  "flawless/arrow-return-style": {
+    "*": {
+      "severityOnly": "error";
+    };
+  };
+  "flawless/no-export-default-arrow": {
+    "*": "error";
+  };
   "flawless/prefer-parameter-destructuring": {
     "*": ["warn", {
       "allowSideEffectReordering": true;
@@ -6317,16 +6317,6 @@ interface RuleOptions {
    * @deprecated
    */
   'arrow-spacing'?: Linter.RuleEntry<ArrowSpacing>;
-  /**
-   * Enforce consistent arrow function return style based on length, multiline expressions, JSX usage, and export context
-   * @see https://github.com/christopher-buss/eslint-plugin-arrow-return-style-x/blob/v1.2.6/src/rules/arrow-return-style/documentation.md
-   */
-  'arrow-style/arrow-return-style'?: Linter.RuleEntry<ArrowStyleArrowReturnStyle>;
-  /**
-   * Disallow anonymous arrow functions as export default declarations
-   * @see https://github.com/christopher-buss/eslint-plugin-arrow-return-style-x/blob/v1.2.6/src/rules/no-export-default-arrow/documentation.md
-   */
-  'arrow-style/no-export-default-arrow'?: Linter.RuleEntry<[]>;
   /**
    * Set a max param number for your constructors, functions, methods etc.
    */
@@ -6834,59 +6824,69 @@ interface RuleOptions {
    * @see https://github.com/eslint-community/eslint-plugin-eslint-plugin/tree/HEAD/docs/rules/unique-test-case-names.md
    */
   'eslint-plugin/unique-test-case-names'?: Linter.RuleEntry<[]>;
+  /**
+   * Enforce arrow function return style based on line length
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/arrow-return-style/documentation.md
+   */
+  'flawless/arrow-return-style'?: Linter.RuleEntry<FlawlessArrowReturnStyle>;
   /**
    * Disallow shorthand boolean JSX attributes
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/jsx-shorthand-boolean/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/jsx-shorthand-boolean/documentation.md
    */
   'flawless/jsx-shorthand-boolean'?: Linter.RuleEntry<[]>;
   /**
    * Enforce a consistent fragment form: the shorthand `<>...</>` or a named fragment
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/jsx-shorthand-fragment/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/jsx-shorthand-fragment/documentation.md
    */
   'flawless/jsx-shorthand-fragment'?: Linter.RuleEntry<FlawlessJsxShorthandFragment>;
   /**
    * Enforce naming conventions for everything across a codebase
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/naming-convention/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/naming-convention/documentation.md
    */
   'flawless/naming-convention'?: Linter.RuleEntry<FlawlessNamingConvention>;
+  /**
+   * Disallow anonymous arrow functions as export default declarations
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-export-default-arrow/documentation.md
+   */
+  'flawless/no-export-default-arrow'?: Linter.RuleEntry<[]>;
   /**
    * Disallow unnecessary usage of 'useCallback'
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/no-unnecessary-use-callback/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-unnecessary-use-callback/documentation.md
    */
   'flawless/no-unnecessary-use-callback'?: Linter.RuleEntry<[]>;
   /**
    * Disallow unnecessary usage of 'useMemo'
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/no-unnecessary-use-memo/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-unnecessary-use-memo/documentation.md
    */
   'flawless/no-unnecessary-use-memo'?: Linter.RuleEntry<[]>;
   /**
    * Enforce destructuring assignment for component props
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-destructuring-assignment/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-destructuring-assignment/documentation.md
    */
   'flawless/prefer-destructuring-assignment'?: Linter.RuleEntry<[]>;
   /**
    * Enforce destructuring parameters in the function signature
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-parameter-destructuring/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-parameter-destructuring/documentation.md
    */
   'flawless/prefer-parameter-destructuring'?: Linter.RuleEntry<FlawlessPreferParameterDestructuring>;
   /**
    * Enforce that function component props are read-only
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-read-only-props/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-read-only-props/documentation.md
    */
   'flawless/prefer-read-only-props'?: Linter.RuleEntry<FlawlessPreferReadOnlyProps>;
   /**
    * Disallow impure calls such as `math.random` or `os.clock` during render
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/purity/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/purity/documentation.md
    */
   'flawless/purity'?: Linter.RuleEntry<FlawlessPurity>;
   /**
    * Enforce a configured sort order for TOML keys and tables
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/toml-sort-keys/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/toml-sort-keys/documentation.md
    */
   'flawless/toml-sort-keys'?: Linter.RuleEntry<FlawlessTomlSortKeys>;
   /**
    * Enforce blank lines around top-level YAML block collection keys
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/yaml-block-key-blank-lines/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/yaml-block-key-blank-lines/documentation.md
    */
   'flawless/yaml-block-key-blank-lines'?: Linter.RuleEntry<[]>;
   /**
@@ -16224,18 +16224,6 @@ type ArrowSpacing = [] | [{
   before?: boolean;
   after?: boolean;
 }];
-// ----- arrow-style/arrow-return-style -----
-type ArrowStyleArrowReturnStyle = [] | [{
-  jsxAlwaysUseExplicitReturn?: boolean;
-  maxLen?: number;
-  maxObjectProperties?: number;
-  namedExportsAlwaysUseExplicitReturn?: boolean;
-  objectReturnStyle?: ("always-explicit" | "complex-explicit" | "off");
-  usePrettier?: (boolean | {
-    [k: string]: unknown | undefined;
-  } | null);
-  [k: string]: unknown | undefined;
-}];
 // ----- better-max-params/better-max-params -----
 type BetterMaxParamsBetterMaxParams = [] | [({
   func?: number;
@@ -16431,6 +16419,18 @@ type EslintPluginRequireTestCaseName = [] | [{
 type EslintPluginTestCasePropertyOrdering = [] | [unknown[]];
 // ----- eslint-plugin/test-case-shorthand-strings -----
 type EslintPluginTestCaseShorthandStrings = [] | [("as-needed" | "never" | "consistent" | "consistent-as-needed")];
+// ----- flawless/arrow-return-style -----
+type FlawlessArrowReturnStyle = [] | [{
+  jsxAlwaysUseExplicitReturn?: boolean;
+  maxLen?: number;
+  maxObjectProperties?: number;
+  namedExportsAlwaysUseExplicitReturn?: boolean;
+  objectReturnStyle?: ("always-explicit" | "complex-explicit" | "off");
+  tabWidth?: number;
+  useOxfmt?: (boolean | {
+    printWidth?: number;
+  });
+}];
 // ----- flawless/jsx-shorthand-fragment -----
 type FlawlessJsxShorthandFragment = [] | [{
   fragmentName?: string;
@@ -26207,7 +26207,7 @@ type Yoda = [] | [("always" | "never")] | [("always" | "never"), {
   onlyEquality?: boolean;
 }];
 // Names of all the configs
-type ConfigNames = 'isentinel/eslint/comments' | 'isentinel/eslint/comments/src' | 'isentinel/e18e/rules' | 'isentinel/eslint-plugin/setup' | 'isentinel/eslint-plugin/rules' | 'isentinel/flawless/setup' | 'isentinel/flawless/rules' | 'isentinel/flawless/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/naming/setup' | 'isentinel/naming/ts/rules-type-aware' | 'isentinel/naming/tsx/rules-type-aware' | '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/package-json/root' | '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/small-rules/setup' | 'isentinel/small-rules' | '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/setup' | 'isentinel/unicorn/rules' | 'isentinel/unicorn/root' | 'isentinel/yaml/setup' | 'isentinel/yaml/rules';
+type ConfigNames = 'isentinel/eslint/comments' | 'isentinel/eslint/comments/src' | 'isentinel/e18e/rules' | 'isentinel/eslint-plugin/setup' | 'isentinel/eslint-plugin/rules' | 'isentinel/flawless/setup' | 'isentinel/flawless/rules' | 'isentinel/flawless/markdown-code' | 'isentinel/flawless/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/naming/setup' | 'isentinel/naming/ts/rules-type-aware' | 'isentinel/naming/tsx/rules-type-aware' | '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/package-json/root' | '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/small-rules/setup' | 'isentinel/small-rules' | 'isentinel/sonarjs' | 'isentinel/spelling/setup' | 'isentinel/spelling' | 'isentinel/stylistic/setup' | 'isentinel/stylistic' | '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/setup' | 'isentinel/unicorn/rules' | 'isentinel/unicorn/root' | 'isentinel/yaml/setup' | 'isentinel/yaml/rules';
 //#endregion
 //#region src/eslint/configs/comments.d.ts
 declare function comments({ prettierOptions, stylistic }?: OptionsFormatters & OptionsStylistic): Promise<Array<TypedFlatConfigItem>>;
@@ -26226,8 +26226,17 @@ declare function e18e({ files, ignores, isInEditor, modernization, type, moduleR
 //#region src/eslint/configs/eslint-plugin.d.ts
 declare function eslintPlugin({ files, overrides }?: OptionsFiles & OptionsOverrides): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
+//#region src/eslint/configs/oxfmt.d.ts
+declare function oxfmt(options?: OptionsComponentExtensions & OptionsFiles & OptionsOverrides & {
+  formatters?: OptionsFormatters | true;
+  oxfmtConfigOptions?: OxfmtOptions;
+  oxfmtOptions?: OxfmtOptions;
+  oxlint?: boolean;
+  prettierOptions?: Options;
+}): Promise<Array<TypedFlatConfigItem>>;
+//#endregion
 //#region src/eslint/configs/flawless.d.ts
-declare function flawless(options?: OptionsOverridesTypeAware & OptionsStylistic & OptionsTypeScriptParserOptions & OptionsTypeScriptWithTypes): Promise<Array<TypedFlatConfigItem>>;
+declare function flawless(options?: OptionsOverridesTypeAware & OptionsStylistic & OptionsTypeScriptParserOptions & OptionsTypeScriptWithTypes, prettierOptions?: PrettierOptions): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
 //#region src/eslint/configs/gitignore.d.ts
 interface GitignoreOptions {
@@ -26269,15 +26278,6 @@ declare function node({ files, ignores }?: OptionsFiles & {
   ignores?: Array<string>;
 }): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
-//#region src/eslint/configs/oxfmt.d.ts
-declare function oxfmt(options?: OptionsComponentExtensions & OptionsFiles & OptionsOverrides & {
-  formatters?: OptionsFormatters | true;
-  oxfmtConfigOptions?: OxfmtOptions;
-  oxfmtOptions?: OxfmtOptions;
-  oxlint?: boolean;
-  prettierOptions?: Options;
-}): Promise<Array<TypedFlatConfigItem>>;
-//#endregion
 //#region src/eslint/configs/package-json.d.ts
 declare function packageJson({ roblox, stylistic, type }?: OptionsHasRoblox & OptionsProjectType & OptionsStylistic): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
@@ -26367,7 +26367,7 @@ declare function spelling(options?: OptionsComponentExtensions & OptionsFiles &
 //#endregion
 //#region src/eslint/configs/stylistic.d.ts
 declare const StylisticConfigDefaults: StylisticConfig;
-declare function stylistic$1(options?: StylisticConfig, prettierOptions?: PrettierOptions): Promise<Array<TypedFlatConfigItem>>;
+declare function stylistic$1(options?: StylisticConfig): Promise<Array<TypedFlatConfigItem>>;
 //#endregion
 //#region src/eslint/configs/test.d.ts
 declare function test({ files, isInEditor, jest, overrides, roblox: isRoblox, stylistic, type, vitest }?: OptionsFiles & OptionsHasRoblox & OptionsIsInEditor & OptionsOverrides & OptionsProjectType & OptionsStylistic & OptionsTestFramework): Promise<Array<TypedFlatConfigItem>>;
@@ -26503,7 +26503,7 @@ interface OptionsFormatters {
   /**
    * Custom options for Prettier.
    *
-   * Used for arrow-return-style-x and as a migration source for oxfmt
+   * Used for flawless/arrow-return-style and as a migration source for oxfmt
    * options.
    */
   prettierOptions?: Options;
@@ -26611,7 +26611,7 @@ interface OptionsTypeScriptErasableOnly {
   erasableOnly?: boolean;
 }
 type StylisticConfig = Pick<StylisticCustomizeOptions, "indent" | "jsx" | "quotes" | "semi"> & {
-  arrowLength?: number;
+  maxLen?: number;
 };
 interface OptionsHasRoblox {
   roblox?: boolean;
@@ -27088,7 +27088,6 @@ declare const defaultPluginRenaming: {
   "@isentinel/eslint-plugin-comment-length": string;
   "@stylistic": string;
   "@typescript-eslint": string;
-  "arrow-return-style-x": string;
   n: string;
   yml: string;
 };

package/dist/index.mjs

@@ -826,26 +826,53 @@ async function eslintPlugin({ files = [GLOB_SRC], overrides = {} } = {}) {
 //#endregion
 //#region src/rules/flawless.ts
 /**
+* Arrow return style rule on its own, for the Markdown code block override
+* where only the line width differs.
+*
+* @param options - Shared rule options.
+* @returns The rule map.
+*/
+function arrowStyleRules({ maxLen, maxLength, printWidth, tabWidth } = {}) {
+	return { "flawless/arrow-return-style": ["error", {
+		jsxAlwaysUseExplicitReturn: true,
+		maxLen: maxLength ?? maxLen ?? printWidth ?? 100,
+		maxObjectProperties: 2,
+		namedExportsAlwaysUseExplicitReturn: true,
+		objectReturnStyle: "complex-explicit",
+		...tabWidth !== void 0 ? { tabWidth } : {},
+		...printWidth !== void 0 ? { useOxfmt: { printWidth } } : {}
+	}] };
+}
+/**
 * Base (non-React) flawless rules shared between the ESLint and oxlint
 * factories. The React flawless rules live in the react rule map; the
 * type-aware `flawless/naming-convention` and the non-JS `flawless/toml-*` and
 * `flawless/yaml-*` rules are configured by their own configs and stay in
 * ESLint.
 *
-* @param options - Shared stylistic options.
+* @param options - Shared stylistic and arrow rule options.
 * @returns The rule map.
 */
-function flawlessRules({ stylistic = true } = {}) {
-	return { ...stylistic !== false ? { "flawless/prefer-parameter-destructuring": "warn" } : {} };
+function flawlessRules({ stylistic = true, ...arrowOptions } = {}) {
+	if (stylistic === false) return {};
+	return {
+		"flawless/no-export-default-arrow": "error",
+		"flawless/prefer-parameter-destructuring": "warn",
+		...arrowStyleRules(arrowOptions)
+	};
 }
 //#endregion
 //#region src/eslint/configs/flawless.ts
-async function flawless(options = {}) {
+async function flawless(options = {}, prettierOptions = {}) {
 	const { overridesTypeAware = {}, stylistic = true, typeAware = true } = options;
 	const eslintPluginFlawless = await interopDefault(import("eslint-plugin-flawless"));
 	const filesTypeAware = [GLOB_TS, GLOB_TSX];
 	const ignoresTypeAware = options.ignoresTypeAware ?? [`**/*.md/**`, "**/*.d.{,c,m}ts"];
 	const isTypeAware = (typeAware ? getTsConfig(options.tsconfigPath) : void 0) !== void 0;
+	const stylisticOptions = typeof stylistic === "object" ? stylistic : {};
+	const printWidth = typeof prettierOptions.printWidth === "number" ? prettierOptions.printWidth : void 0;
+	const tabWidth = typeof prettierOptions.tabWidth === "number" ? prettierOptions.tabWidth : void 0;
+	const typeAwareRules = { "flawless/prefer-read-only-props": "error" };
 	return [
 		{
 			name: "isentinel/flawless/setup",
@@ -853,15 +880,29 @@ async function flawless(options = {}) {
 		},
 		{
 			name: "isentinel/flawless/rules",
-			files: [GLOB_TS],
-			rules: flawlessRules({ stylistic })
+			files: [GLOB_SRC],
+			rules: flawlessRules({
+				maxLen: stylisticOptions.maxLen,
+				printWidth,
+				stylistic,
+				tabWidth
+			})
 		},
+		...stylistic !== false ? [{
+			name: "isentinel/flawless/markdown-code",
+			files: [GLOB_MARKDOWN_CODE],
+			rules: arrowStyleRules({
+				maxLength: Number(prettierOptions["jsdocPrintWidth"]) || 80,
+				printWidth,
+				tabWidth
+			})
+		}] : [],
 		...isTypeAware ? [{
 			name: "isentinel/flawless/rules-type-aware",
 			files: filesTypeAware,
 			ignores: ignoresTypeAware,
 			rules: {
-				"flawless/prefer-read-only-props": "error",
+				...typeAwareRules,
 				...overridesTypeAware
 			}
 		}] : []
@@ -2055,7 +2096,6 @@ const defaultPluginRenaming = {
 	"@isentinel/eslint-plugin-comment-length": "comment-length",
 	"@stylistic": "style",
 	"@typescript-eslint": "ts",
-	"arrow-return-style-x": "arrow-style",
 	"n": "node",
 	"yml": "yaml"
 };
@@ -3972,7 +4012,6 @@ function stylisticRules({ jsx = true, quotes = "double" } = {}) {
 		"antfu/consistent-list-newline": "off",
 		"antfu/if-newline": "off",
 		"antfu/top-level-function": "error",
-		"arrow-style/no-export-default-arrow": "error",
 		"curly": ["error", "all"],
 		...jsx ? { "style/jsx-curly-brace-presence": ["error", { propElementValues: "always" }] } : {},
 		"style/lines-between-class-members": ["error", { enforce: [{
@@ -4025,22 +4064,6 @@ function stylisticRules({ jsx = true, quotes = "double" } = {}) {
 		]
 	};
 }
-/**
-* Arrow return style rule shared between the ESLint and oxlint factories.
-*
-* @param options - Shared rule options.
-* @returns The rule map.
-*/
-function arrowStyleRules({ arrowLength, maxLength, printWidth, usePrettier } = {}) {
-	return { "arrow-style/arrow-return-style": ["error", {
-		jsxAlwaysUseExplicitReturn: true,
-		maxLen: maxLength ?? arrowLength ?? printWidth ?? 100,
-		maxObjectProperties: 2,
-		namedExportsAlwaysUseExplicitReturn: true,
-		objectReturnStyle: "complex-explicit",
-		...usePrettier ? { usePrettier } : {}
-	}] };
-}
 //#endregion
 //#region src/eslint/configs/stylistic.ts
 const StylisticConfigDefaults = {
@@ -4049,16 +4072,12 @@ const StylisticConfigDefaults = {
 	quotes: "double",
 	semi: true
 };
-async function stylistic(options = {}, prettierOptions = {}) {
-	const { arrowLength, indent, jsx, quotes, semi } = {
+async function stylistic(options = {}) {
+	const { indent, jsx, quotes, semi } = {
 		...StylisticConfigDefaults,
 		...options
 	};
-	const [pluginArrowReturnStyle, pluginStylistic, pluginAntfu] = await Promise.all([
-		interopDefault(import("eslint-plugin-arrow-return-style-x")),
-		interopDefault(import("@stylistic/eslint-plugin")),
-		interopDefault(import("eslint-plugin-antfu"))
-	]);
+	const [pluginStylistic, pluginAntfu] = await Promise.all([interopDefault(import("@stylistic/eslint-plugin")), interopDefault(import("eslint-plugin-antfu"))]);
 	const config = pluginStylistic.configs.customize({
 		indent,
 		jsx,
@@ -4066,52 +4085,25 @@ async function stylistic(options = {}, prettierOptions = {}) {
 		quotes,
 		semi
 	});
-	function createArrowStyleRule(_, maxLength) {
-		return arrowStyleRules({
-			arrowLength,
-			maxLength,
-			printWidth: typeof prettierOptions.printWidth === "number" ? prettierOptions.printWidth : void 0,
-			usePrettier: prettierOptions
-		});
-	}
-	return [
-		{
-			name: "isentinel/stylistic/setup",
-			plugins: {
-				"antfu": pluginAntfu,
-				"arrow-style": pluginArrowReturnStyle,
-				"style": pluginStylistic
-			}
-		},
-		{
-			name: "isentinel/stylistic",
-			files: [GLOB_SRC],
-			rules: {
-				...config.rules,
-				...stylisticRules({
-					indent,
-					jsx,
-					quotes,
-					semi
-				})
-			}
-		},
-		{
-			name: "isentinel/stylistic/ts",
-			files: [GLOB_TS, GLOB_TSX],
-			rules: { ...createArrowStyleRule("oxc-ts") }
-		},
-		{
-			name: "isentinel/stylistic/js",
-			files: [GLOB_JS, GLOB_JSX],
-			rules: { ...createArrowStyleRule("oxc") }
-		},
-		{
-			name: "isentinel/stylistic/markdown-code",
-			files: [GLOB_MARKDOWN_CODE],
-			rules: { ...createArrowStyleRule("oxc", Number(prettierOptions["jsdocPrintWidth"]) || 80) }
+	return [{
+		name: "isentinel/stylistic/setup",
+		plugins: {
+			antfu: pluginAntfu,
+			style: pluginStylistic
 		}
-	];
+	}, {
+		name: "isentinel/stylistic",
+		files: [GLOB_SRC],
+		rules: {
+			...config.rules,
+			...stylisticRules({
+				indent,
+				jsx,
+				quotes,
+				semi
+			})
+		}
+	}];
 }
 //#endregion
 //#region src/rules/test.ts
@@ -14179,6 +14171,7 @@ const oxlintRuleMapping = {
 	"dot-notation": "js-plugin",
 	"id-length": "js-plugin",
 	"no-dupe-args": "js-plugin",
+	"no-loop-func": "js-plugin",
 	"no-octal": "js-plugin",
 	"no-octal-escape": "js-plugin",
 	"no-restricted-syntax": "js-plugin",
@@ -14522,7 +14515,6 @@ const oxlintRuleMapping = {
 	"e18e/prefer-string-fromcharcode": "js-plugin",
 	"e18e/prefer-timer-args": "js-plugin",
 	"e18e/prefer-url-canparse": "js-plugin",
-	"arrow-style/arrow-return-style": "js-plugin",
 	"style/jsx-curly-brace-presence": "js-plugin",
 	"style/jsx-newline": "js-plugin",
 	"style/jsx-self-closing-comp": "js-plugin",
@@ -14543,8 +14535,10 @@ const oxlintRuleMapping = {
 	"small-rules/prefer-singular-enums": "js-plugin",
 	"small-rules/react-hooks-strict-return": "js-plugin",
 	"small-rules/strict-component-boundaries": "js-plugin",
+	"flawless/arrow-return-style": "js-plugin",
 	"flawless/jsx-shorthand-boolean": "js-plugin",
 	"flawless/jsx-shorthand-fragment": "js-plugin",
+	"flawless/no-export-default-arrow": "js-plugin",
 	"flawless/no-unnecessary-use-callback": "js-plugin",
 	"flawless/no-unnecessary-use-memo": "js-plugin",
 	"flawless/prefer-destructuring-assignment": "js-plugin",
@@ -14786,7 +14780,6 @@ const oxlintRuleMapping = {
 * emitted as a jsPlugin requires type checking.
 */
 const typeAwareJsPluginRules = /* @__PURE__ */ new Set([
-	"arrow-style/no-export-default-arrow",
 	"eslint-plugin/no-property-in-node",
 	"jest/no-error-equal",
 	"jest/no-unnecessary-assertion",
@@ -15188,7 +15181,7 @@ async function isentinel(options, ...userConfigs) {
 	}), comments({
 		prettierOptions: prettierSettings,
 		stylistic: stylisticOptions
-	}), flawless({ stylistic: stylisticOptions }), ignores(options.ignores), imports({
+	}), flawless({ stylistic: stylisticOptions }, prettierSettings), ignores(options.ignores), imports({
 		stylistic: stylisticOptions,
 		type: projectType
 	}), packageJson({
@@ -15241,7 +15234,7 @@ async function isentinel(options, ...userConfigs) {
 			stylistic: stylisticOptions
 		}, shouldFormatLua));
 	}
-	if (stylisticOptions !== false) configs.push(stylistic(stylisticOptions, prettierSettings), perfectionist({
+	if (stylisticOptions !== false) configs.push(stylistic(stylisticOptions), perfectionist({
 		...resolveSubOptions(options, "perfectionist"),
 		type: projectType
 	}));

package/dist/oxlint.d.mts

@@ -287,11 +287,6 @@ interface OxlintMainRuleDefaults {
   "arrow-body-style": {
     "*": "off";
   };
-  "arrow-style/arrow-return-style": {
-    "*": {
-      "severityOnly": "error";
-    };
-  };
   "better-max-params/better-max-params": {
     "*": ["error", {
       "func": 4;
@@ -429,6 +424,14 @@ interface OxlintMainRuleDefaults {
       "initialized": "never";
     }];
   };
+  "flawless/arrow-return-style": {
+    "*": {
+      "severityOnly": "error";
+    };
+  };
+  "flawless/no-export-default-arrow": {
+    "*": "error";
+  };
   "flawless/prefer-parameter-destructuring": {
     "*": "warn";
   };
@@ -3534,16 +3537,6 @@ interface RuleOptions {
    * @deprecated
    */
   'arrow-spacing'?: Linter.RuleEntry<ArrowSpacing>;
-  /**
-   * Enforce consistent arrow function return style based on length, multiline expressions, JSX usage, and export context
-   * @see https://github.com/christopher-buss/eslint-plugin-arrow-return-style-x/blob/v1.2.6/src/rules/arrow-return-style/documentation.md
-   */
-  'arrow-style/arrow-return-style'?: Linter.RuleEntry<ArrowStyleArrowReturnStyle>;
-  /**
-   * Disallow anonymous arrow functions as export default declarations
-   * @see https://github.com/christopher-buss/eslint-plugin-arrow-return-style-x/blob/v1.2.6/src/rules/no-export-default-arrow/documentation.md
-   */
-  'arrow-style/no-export-default-arrow'?: Linter.RuleEntry<[]>;
   /**
    * Set a max param number for your constructors, functions, methods etc.
    */
@@ -4051,59 +4044,69 @@ interface RuleOptions {
    * @see https://github.com/eslint-community/eslint-plugin-eslint-plugin/tree/HEAD/docs/rules/unique-test-case-names.md
    */
   'eslint-plugin/unique-test-case-names'?: Linter.RuleEntry<[]>;
+  /**
+   * Enforce arrow function return style based on line length
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/arrow-return-style/documentation.md
+   */
+  'flawless/arrow-return-style'?: Linter.RuleEntry<FlawlessArrowReturnStyle>;
   /**
    * Disallow shorthand boolean JSX attributes
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/jsx-shorthand-boolean/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/jsx-shorthand-boolean/documentation.md
    */
   'flawless/jsx-shorthand-boolean'?: Linter.RuleEntry<[]>;
   /**
    * Enforce a consistent fragment form: the shorthand `<>...</>` or a named fragment
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/jsx-shorthand-fragment/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/jsx-shorthand-fragment/documentation.md
    */
   'flawless/jsx-shorthand-fragment'?: Linter.RuleEntry<FlawlessJsxShorthandFragment>;
   /**
    * Enforce naming conventions for everything across a codebase
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/naming-convention/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/naming-convention/documentation.md
    */
   'flawless/naming-convention'?: Linter.RuleEntry<FlawlessNamingConvention>;
+  /**
+   * Disallow anonymous arrow functions as export default declarations
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-export-default-arrow/documentation.md
+   */
+  'flawless/no-export-default-arrow'?: Linter.RuleEntry<[]>;
   /**
    * Disallow unnecessary usage of 'useCallback'
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/no-unnecessary-use-callback/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-unnecessary-use-callback/documentation.md
    */
   'flawless/no-unnecessary-use-callback'?: Linter.RuleEntry<[]>;
   /**
    * Disallow unnecessary usage of 'useMemo'
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/no-unnecessary-use-memo/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/no-unnecessary-use-memo/documentation.md
    */
   'flawless/no-unnecessary-use-memo'?: Linter.RuleEntry<[]>;
   /**
    * Enforce destructuring assignment for component props
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-destructuring-assignment/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-destructuring-assignment/documentation.md
    */
   'flawless/prefer-destructuring-assignment'?: Linter.RuleEntry<[]>;
   /**
    * Enforce destructuring parameters in the function signature
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-parameter-destructuring/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-parameter-destructuring/documentation.md
    */
   'flawless/prefer-parameter-destructuring'?: Linter.RuleEntry<FlawlessPreferParameterDestructuring>;
   /**
    * Enforce that function component props are read-only
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/prefer-read-only-props/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/prefer-read-only-props/documentation.md
    */
   'flawless/prefer-read-only-props'?: Linter.RuleEntry<FlawlessPreferReadOnlyProps>;
   /**
    * Disallow impure calls such as `math.random` or `os.clock` during render
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/purity/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/purity/documentation.md
    */
   'flawless/purity'?: Linter.RuleEntry<FlawlessPurity>;
   /**
    * Enforce a configured sort order for TOML keys and tables
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/toml-sort-keys/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/toml-sort-keys/documentation.md
    */
   'flawless/toml-sort-keys'?: Linter.RuleEntry<FlawlessTomlSortKeys>;
   /**
    * Enforce blank lines around top-level YAML block collection keys
-   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.11/src/rules/yaml-block-key-blank-lines/documentation.md
+   * @see https://github.com/christopher-buss/eslint-plugin-flawless/blob/v0.1.12/src/rules/yaml-block-key-blank-lines/documentation.md
    */
   'flawless/yaml-block-key-blank-lines'?: Linter.RuleEntry<[]>;
   /**
@@ -13441,18 +13444,6 @@ type ArrowSpacing = [] | [{
   before?: boolean;
   after?: boolean;
 }];
-// ----- arrow-style/arrow-return-style -----
-type ArrowStyleArrowReturnStyle = [] | [{
-  jsxAlwaysUseExplicitReturn?: boolean;
-  maxLen?: number;
-  maxObjectProperties?: number;
-  namedExportsAlwaysUseExplicitReturn?: boolean;
-  objectReturnStyle?: ("always-explicit" | "complex-explicit" | "off");
-  usePrettier?: (boolean | {
-    [k: string]: unknown | undefined;
-  } | null);
-  [k: string]: unknown | undefined;
-}];
 // ----- better-max-params/better-max-params -----
 type BetterMaxParamsBetterMaxParams = [] | [({
   func?: number;
@@ -13648,6 +13639,18 @@ type EslintPluginRequireTestCaseName = [] | [{
 type EslintPluginTestCasePropertyOrdering = [] | [unknown[]];
 // ----- eslint-plugin/test-case-shorthand-strings -----
 type EslintPluginTestCaseShorthandStrings = [] | [("as-needed" | "never" | "consistent" | "consistent-as-needed")];
+// ----- flawless/arrow-return-style -----
+type FlawlessArrowReturnStyle = [] | [{
+  jsxAlwaysUseExplicitReturn?: boolean;
+  maxLen?: number;
+  maxObjectProperties?: number;
+  namedExportsAlwaysUseExplicitReturn?: boolean;
+  objectReturnStyle?: ("always-explicit" | "complex-explicit" | "off");
+  tabWidth?: number;
+  useOxfmt?: (boolean | {
+    printWidth?: number;
+  });
+}];
 // ----- flawless/jsx-shorthand-fragment -----
 type FlawlessJsxShorthandFragment = [] | [{
   fragmentName?: string;
@@ -23531,7 +23534,7 @@ interface OptionsFormatters {
   /**
    * Custom options for Prettier.
    *
-   * Used for arrow-return-style-x and as a migration source for oxfmt
+   * Used for flawless/arrow-return-style and as a migration source for oxfmt
    * options.
    */
   prettierOptions?: Options;
@@ -23639,7 +23642,7 @@ interface OptionsTypeScriptErasableOnly {
   erasableOnly?: boolean;
 }
 type StylisticConfig = Pick<StylisticCustomizeOptions, "indent" | "jsx" | "quotes" | "semi"> & {
-  arrowLength?: number;
+  maxLen?: number;
 };
 //#endregion
 //#region src/eslint/types.d.ts
@@ -32001,7 +32004,7 @@ type OxlintCommentsRequireDescription = [] | [{
   ignore?: ("oxlint-disable" | "oxlint-disable-line" | "oxlint-disable-next-line" | "oxlint-enable")[];
 }];
 /** JsPlugin prefixes whose rules keep their ESLint-side names in oxlint configs. */
-type OxlintKeptJsPluginPrefix = '@cspell' | 'antfu' | 'arrow-style' | 'better-max-params' | 'comment-length' | 'de-morgan' | 'e18e' | 'erasable-syntax-only' | 'eslint-plugin' | 'flawless' | 'oxfmt' | 'perfectionist' | 'react-jsx' | 'react-naming-convention' | 'roblox' | 'sentinel' | 'small-rules' | 'sonar' | 'style' | 'ts' | 'unused-imports';
+type OxlintKeptJsPluginPrefix = '@cspell' | 'antfu' | 'better-max-params' | 'comment-length' | 'de-morgan' | 'e18e' | 'erasable-syntax-only' | 'eslint-plugin' | 'flawless' | 'oxfmt' | 'perfectionist' | 'react-jsx' | 'react-naming-convention' | 'roblox' | 'sentinel' | 'small-rules' | 'sonar' | 'style' | 'ts' | 'unused-imports';
 /** JsPlugin rules whose oxlint names match the ESLint-side names. */
 type OxlintKeptJsPluginRuleOptions = { [K in keyof RuleOptions as K extends `${OxlintKeptJsPluginPrefix}/${string}` ? K : never]: RuleOptions[K]; };
 /** All rules known to the oxlint factory, keyed by canonical oxlint rule name. */

package/dist/oxlint.mjs

@@ -7,8 +7,8 @@ import path from "node:path";
 import process from "node:process";
 import "prettier";
 import { minVersion } from "semver";
-import globals from "globals";
 import { pathToFileURL } from "node:url";
+import globals from "globals";
 //#region src/rules/oxlint-mapping.ts
 /**
 * Notable rule families that intentionally stay in ESLint in hybrid mode,
@@ -17,7 +17,7 @@ import { pathToFileURL } from "node:url";
 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 (prefer-parameter-destructuring, the react jsx-shorthand-*, purity, no-unnecessary-use-*, prefer-destructuring-assignment) are mapped and run in oxlint. 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, no-export-default-arrow, prefer-parameter-destructuring, the react jsx-shorthand-*, purity, no-unnecessary-use-*, prefer-destructuring-assignment) are mapped and run in oxlint. 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)",
@@ -25,7 +25,7 @@ const staysInEslint = {
 	"react/* (type-aware)": "The @eslint-react type-aware rules (no-implicit-children/key/ref, no-leaked-conditional-rendering, no-unused-props) need type information but do NOT declare requiresTypeChecking, so the metadata-based parity test cannot catch them; they are excluded manually and stay in ESLint",
 	"roblox/* (type-aware)": "Type-aware custom rules (lua-truthiness etc.); oxlint jsPlugins have no type information",
 	"sentinel/explicit-size-check": "Type-aware custom rule; oxlint jsPlugins have no type information",
-	"type-aware jsPlugin rules": "Rules whose meta.docs.requiresTypeChecking is true crash or silently no-op under oxlint's jsPlugin runtime (no type information): sonar/no-async-constructor, sonar/no-ignored-return, sonar/no-incompatible-assertion-types, sonar/no-redundant-optional, sonar/no-try-promise, sonar/prefer-immediate-return, unicorn/no-non-function-verb-prefix, arrow-style/no-export-default-arrow, eslint-plugin/no-property-in-node, jest/no-error-equal, jest/no-unnecessary-assertion, jest/unbound-method, jest/valid-expect-with-promise",
+	"type-aware jsPlugin rules": "Rules whose meta.docs.requiresTypeChecking is true crash or silently no-op under oxlint's jsPlugin runtime (no type information): sonar/no-async-constructor, sonar/no-ignored-return, sonar/no-incompatible-assertion-types, sonar/no-redundant-optional, sonar/no-try-promise, sonar/prefer-immediate-return, unicorn/no-non-function-verb-prefix, eslint-plugin/no-property-in-node, jest/no-error-equal, jest/no-unnecessary-assertion, jest/unbound-method, jest/valid-expect-with-promise",
 	"unicorn/no-unsafe-string-replacement": "False positives under oxlint's jsPlugin scope analysis (template-literal replacements are not resolved)"
 };
 const oxlintRuleMapping = {
@@ -148,6 +148,7 @@ const oxlintRuleMapping = {
 	"dot-notation": "js-plugin",
 	"id-length": "js-plugin",
 	"no-dupe-args": "js-plugin",
+	"no-loop-func": "js-plugin",
 	"no-octal": "js-plugin",
 	"no-octal-escape": "js-plugin",
 	"no-restricted-syntax": "js-plugin",
@@ -491,7 +492,6 @@ const oxlintRuleMapping = {
 	"e18e/prefer-string-fromcharcode": "js-plugin",
 	"e18e/prefer-timer-args": "js-plugin",
 	"e18e/prefer-url-canparse": "js-plugin",
-	"arrow-style/arrow-return-style": "js-plugin",
 	"style/jsx-curly-brace-presence": "js-plugin",
 	"style/jsx-newline": "js-plugin",
 	"style/jsx-self-closing-comp": "js-plugin",
@@ -512,8 +512,10 @@ const oxlintRuleMapping = {
 	"small-rules/prefer-singular-enums": "js-plugin",
 	"small-rules/react-hooks-strict-return": "js-plugin",
 	"small-rules/strict-component-boundaries": "js-plugin",
+	"flawless/arrow-return-style": "js-plugin",
 	"flawless/jsx-shorthand-boolean": "js-plugin",
 	"flawless/jsx-shorthand-fragment": "js-plugin",
+	"flawless/no-export-default-arrow": "js-plugin",
 	"flawless/no-unnecessary-use-callback": "js-plugin",
 	"flawless/no-unnecessary-use-memo": "js-plugin",
 	"flawless/prefer-destructuring-assignment": "js-plugin",
@@ -755,7 +757,6 @@ const oxlintRuleMapping = {
 * emitted as a jsPlugin requires type checking.
 */
 const typeAwareJsPluginRules = /* @__PURE__ */ new Set([
-	"arrow-style/no-export-default-arrow",
 	"eslint-plugin/no-property-in-node",
 	"jest/no-error-equal",
 	"jest/no-unnecessary-assertion",
@@ -853,7 +854,6 @@ const oxlintJsPluginPrefixRenames = {
 const oxlintJsPlugins = {
 	"@cspell": "@cspell/eslint-plugin",
 	"antfu": "eslint-plugin-antfu",
-	"arrow-style": "eslint-plugin-arrow-return-style-x",
 	"better-max-params": "eslint-plugin-better-max-params",
 	"comment-length": "eslint-plugin-comment-length",
 	"de-morgan": "eslint-plugin-de-morgan",
@@ -972,9 +972,7 @@ const GLOB_ROOT = [
 ];
 const GLOB_SRC_EXT = "{,c,m}[jt]s{,x}";
 const GLOB_SRC = "**/*.{,c,m}[jt]s{,x}";
-const GLOB_JS = "**/*.{,c,m}js";
 const GLOB_JSX = "**/*.{,c,m}jsx";
-const GLOB_TS = "**/*.{,c,m}ts";
 const GLOB_TSX = "**/*.{,c,m}tsx";
 const GLOB_DTS = "**/*.d.{,c,m}ts";
 const GLOB_TESTS = [
@@ -1409,6 +1407,24 @@ const NATIVE_PLUGINS = /* @__PURE__ */ new Set([
 	"vue"
 ]);
 /**
+* Anchor for resolving a plugin from the consumer project, used when a plugin
+* is a peer dependency the consumer installs rather than one we depend on.
+*/
+const consumerAnchor = pathToFileURL(`${process.cwd()}/`).href;
+const specifierCache = /* @__PURE__ */ new Map();
+/**
+* Resolve a jsPlugin specifier, throwing when the package is not installed.
+*
+* @param specifier - The plugin package specifier.
+* @returns The absolute `file://` specifier.
+* @throws {Error} When the package cannot be resolved.
+*/
+function resolveJsPluginSpecifier(specifier) {
+	const resolved = tryResolveJsPlugin(specifier);
+	if (resolved === void 0) throw new Error(`[@isentinel/eslint-config] Cannot resolve oxlint jsPlugin "${specifier}". Install it in your project, or disable the rules that require it.`);
+	return resolved;
+}
+/**
 * Split a canonical (ESLint-named) rule map into oxlint-native rules and
 * jsPlugin rules, translating rule names via the oxlint rule mapping.
 *
@@ -1445,7 +1461,7 @@ function splitOxlintRules(rules, keepUnmappedOff = false) {
 				nativePlugins.add(prefix);
 			} else {
 				const specifier = oxlintJsPlugins[prefix];
-				if (specifier !== void 0 && isPackageExists(specifier)) {
+				if (specifier !== void 0 && canResolveJsPlugin(specifier)) {
 					jsPluginRules[translated] = value;
 					jsPluginPrefixes.add(prefix);
 				}
@@ -1470,7 +1486,7 @@ function splitOxlintRules(rules, keepUnmappedOff = false) {
 		if (specifier === void 0) throw new Error(`[@isentinel/eslint-config] Unknown oxlint jsPlugin prefix: ${prefix}`);
 		jsPlugins.push({
 			name: prefix,
-			specifier
+			specifier: resolveJsPluginSpecifier(specifier)
 		});
 	}
 	return {
@@ -1510,6 +1526,49 @@ function createOxlintConfigs({ name, excludeFiles, files, globals, keepUnmappedO
 	});
 	return fragments;
 }
+/**
+* Resolve a specifier against an optional anchor, swallowing resolution errors.
+*
+* @param specifier - The plugin package specifier.
+* @param anchor - The URL to resolve against, or the current module by default.
+* @returns The resolved URL, or `undefined` when it does not resolve.
+*/
+function resolveFrom(specifier, anchor) {
+	try {
+		return import.meta.resolve(specifier, anchor);
+	} catch {
+		return;
+	}
+}
+/**
+* Resolve a jsPlugin package specifier to an absolute `file://` URL.
+*
+* Oxlint resolves bare `jsPlugins` specifiers relative to the consumer's config
+* file, which fails under pnpm's isolated node_modules: our plugin dependencies
+* only exist inside our own virtual store scope, never at the consumer's root.
+* Resolving here (from our package first, then the consumer) and emitting an
+* absolute specifier makes loading independent of the consumer's layout.
+*
+* @param specifier - The plugin package specifier.
+* @returns The resolved specifier, or `undefined` when it resolves nowhere.
+*/
+function tryResolveJsPlugin(specifier) {
+	const cached = specifierCache.get(specifier);
+	if (cached !== void 0 || specifierCache.has(specifier)) return cached;
+	const resolved = resolveFrom(specifier) ?? resolveFrom(specifier, consumerAnchor);
+	specifierCache.set(specifier, resolved);
+	return resolved;
+}
+/**
+* Whether a jsPlugin package can be resolved from either our package or the
+* consumer project.
+*
+* @param specifier - The plugin package specifier.
+* @returns Whether the plugin is resolvable.
+*/
+function canResolveJsPlugin(specifier) {
+	return tryResolveJsPlugin(specifier) !== void 0;
+}
 function mappedTarget(rule) {
 	return oxlintRuleMapping[rule] === "js-plugin" ? "js-plugin" : "native";
 }
@@ -1522,7 +1581,7 @@ function oxlintComments({ prettierOptions = {}, stylistic = true } = {}) {
 			files: [GLOB_SRC],
 			jsPlugins: [{
 				name: "oxlint-comments",
-				specifier: "oxlint-plugin-oxlint-comments"
+				specifier: resolveJsPluginSpecifier("oxlint-plugin-oxlint-comments")
 			}],
 			rules: {
 				"oxlint-comments/disable-enable-pair": ["error", { allowWholeFile: true }],
@@ -1609,7 +1668,7 @@ function oxlintDisables({ root }) {
 			files: [GLOB_DTS],
 			jsPlugins: [{
 				name: "oxlint-comments",
-				specifier: "oxlint-plugin-oxlint-comments"
+				specifier: resolveJsPluginSpecifier("oxlint-plugin-oxlint-comments")
 			}],
 			rules: { "oxlint-comments/no-unlimited-disable": "off" }
 		},
@@ -1781,25 +1840,53 @@ function oxlintEslintPlugin(options = {}) {
 //#endregion
 //#region src/rules/flawless.ts
 /**
+* Arrow return style rule on its own, for the Markdown code block override
+* where only the line width differs.
+*
+* @param options - Shared rule options.
+* @returns The rule map.
+*/
+function arrowStyleRules({ maxLen, maxLength, printWidth, tabWidth } = {}) {
+	return { "flawless/arrow-return-style": ["error", {
+		jsxAlwaysUseExplicitReturn: true,
+		maxLen: maxLength ?? maxLen ?? printWidth ?? 100,
+		maxObjectProperties: 2,
+		namedExportsAlwaysUseExplicitReturn: true,
+		objectReturnStyle: "complex-explicit",
+		...tabWidth !== void 0 ? { tabWidth } : {},
+		...printWidth !== void 0 ? { useOxfmt: { printWidth } } : {}
+	}] };
+}
+/**
 * Base (non-React) flawless rules shared between the ESLint and oxlint
 * factories. The React flawless rules live in the react rule map; the
 * type-aware `flawless/naming-convention` and the non-JS `flawless/toml-*` and
 * `flawless/yaml-*` rules are configured by their own configs and stay in
 * ESLint.
 *
-* @param options - Shared stylistic options.
+* @param options - Shared stylistic and arrow rule options.
 * @returns The rule map.
 */
-function flawlessRules({ stylistic = true } = {}) {
-	return { ...stylistic !== false ? { "flawless/prefer-parameter-destructuring": "warn" } : {} };
+function flawlessRules({ stylistic = true, ...arrowOptions } = {}) {
+	if (stylistic === false) return {};
+	return {
+		"flawless/no-export-default-arrow": "error",
+		"flawless/prefer-parameter-destructuring": "warn",
+		...arrowStyleRules(arrowOptions)
+	};
 }
 //#endregion
 //#region src/oxlint/configs/flawless.ts
-function oxlintFlawless({ stylistic = true } = {}) {
+function oxlintFlawless({ stylistic = true } = {}, prettierOptions = {}) {
 	return createOxlintConfigs({
 		name: "isentinel/flawless",
-		files: [GLOB_TS],
-		rules: flawlessRules({ stylistic })
+		files: [GLOB_SRC],
+		rules: flawlessRules({
+			maxLen: (typeof stylistic === "object" ? stylistic : {}).maxLen,
+			printWidth: typeof prettierOptions["printWidth"] === "number" ? prettierOptions["printWidth"] : void 0,
+			stylistic,
+			tabWidth: typeof prettierOptions["tabWidth"] === "number" ? prettierOptions["tabWidth"] : void 0
+		})
 	});
 }
 //#endregion
@@ -2339,7 +2426,6 @@ const defaultPluginRenaming = {
 	"@isentinel/eslint-plugin-comment-length": "comment-length",
 	"@stylistic": "style",
 	"@typescript-eslint": "ts",
-	"arrow-return-style-x": "arrow-style",
 	"n": "node",
 	"yml": "yaml"
 };
@@ -2361,11 +2447,11 @@ function oxlintOxfmt(options) {
 	}
 	if (!jsPlugins.some((plugin) => typeof plugin !== "string" && plugin.name === "style")) jsPlugins.push({
 		name: "style",
-		specifier: "@stylistic/eslint-plugin"
+		specifier: resolveJsPluginSpecifier("@stylistic/eslint-plugin")
 	});
 	const oxfmtPlugin = {
 		name: "oxfmt",
-		specifier: "eslint-plugin-oxfmt"
+		specifier: resolveJsPluginSpecifier("eslint-plugin-oxfmt")
 	};
 	const jsFiles = oxfmtFiles?.flat() ?? ["**/*.{,c,m}js", "**/*.{,c,m}jsx"];
 	const tsFiles = oxfmtFiles?.flat() ?? [
@@ -3031,7 +3117,6 @@ function stylisticRules({ jsx = true, quotes = "double" } = {}) {
 		"antfu/consistent-list-newline": "off",
 		"antfu/if-newline": "off",
 		"antfu/top-level-function": "error",
-		"arrow-style/no-export-default-arrow": "error",
 		"curly": ["error", "all"],
 		...jsx ? { "style/jsx-curly-brace-presence": ["error", { propElementValues: "always" }] } : {},
 		"style/lines-between-class-members": ["error", { enforce: [{
@@ -3084,48 +3169,14 @@ function stylisticRules({ jsx = true, quotes = "double" } = {}) {
 		]
 	};
 }
-/**
-* Arrow return style rule shared between the ESLint and oxlint factories.
-*
-* @param options - Shared rule options.
-* @returns The rule map.
-*/
-function arrowStyleRules({ arrowLength, maxLength, printWidth, usePrettier } = {}) {
-	return { "arrow-style/arrow-return-style": ["error", {
-		jsxAlwaysUseExplicitReturn: true,
-		maxLen: maxLength ?? arrowLength ?? printWidth ?? 100,
-		maxObjectProperties: 2,
-		namedExportsAlwaysUseExplicitReturn: true,
-		objectReturnStyle: "complex-explicit",
-		...usePrettier ? { usePrettier } : {}
-	}] };
-}
 //#endregion
 //#region src/oxlint/configs/stylistic.ts
-function oxlintStylistic(options = {}, prettierOptions = {}) {
-	const { arrowLength } = options;
-	const arrowRules = arrowStyleRules({
-		arrowLength,
-		printWidth: typeof prettierOptions["printWidth"] === "number" ? prettierOptions["printWidth"] : void 0,
-		usePrettier: prettierOptions
+function oxlintStylistic(options = {}) {
+	return createOxlintConfigs({
+		name: "isentinel/stylistic",
+		files: [GLOB_SRC],
+		rules: stylisticRules(options)
 	});
-	return [
-		...createOxlintConfigs({
-			name: "isentinel/stylistic",
-			files: [GLOB_SRC],
-			rules: stylisticRules(options)
-		}),
-		...createOxlintConfigs({
-			name: "isentinel/stylistic/ts",
-			files: [GLOB_TS, GLOB_TSX],
-			rules: arrowRules
-		}),
-		...createOxlintConfigs({
-			name: "isentinel/stylistic/js",
-			files: [GLOB_JS, GLOB_JSX],
-			rules: arrowRules
-		})
-	];
 }
 //#endregion
 //#region src/rules/test.ts
@@ -3959,7 +4010,7 @@ function isentinel(factoryOptions, ...userConfigs) {
 	if (stylisticOptions !== false) configs.push(oxlintPerfectionist({
 		...resolveSubOptions(options, "perfectionist"),
 		type: projectType
-	}), oxlintStylistic(stylisticOptions, prettierSettings));
+	}), oxlintStylistic(stylisticOptions));
 	if (enableReact !== false) {
 		const reactOptions = typeof enableReact === "object" ? enableReact : {};
 		configs.push(oxlintReact({
@@ -3984,7 +4035,7 @@ function isentinel(factoryOptions, ...userConfigs) {
 		componentExts: componentExtensions,
 		isInEditor,
 		stylistic: stylisticOptions
-	}), oxlintFlawless({ stylistic: stylisticOptions }), oxlintComments({
+	}), oxlintFlawless({ stylistic: stylisticOptions }, prettierSettings), oxlintComments({
 		prettierOptions: prettierSettings,
 		stylistic: stylisticOptions
 	}), oxlintDisables({ root: rootGlobs }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "6.0.0-beta.10",
+  "version": "6.0.0-beta.12",
   "description": "iSentinel's ESLint config",
   "keywords": [
     "eslint-config",
@@ -63,11 +63,10 @@
     "eslint-flat-config-utils": "3.2.0",
     "eslint-merge-processors": "2.0.0",
     "eslint-plugin-antfu": "3.2.3",
-    "eslint-plugin-arrow-return-style-x": "1.2.6",
     "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": "0.1.11",
+    "eslint-plugin-flawless": "0.1.12",
     "eslint-plugin-format-lua": "2.0.0",
     "eslint-plugin-import-lite": "0.6.0",
     "eslint-plugin-jsdoc": "63.0.13",
@@ -133,7 +132,7 @@
     "typescript": "6.0.3",
     "unplugin-unused": "0.5.7",
     "vitest": "4.1.10",
-    "@isentinel/eslint-config": "6.0.0-beta.10"
+    "@isentinel/eslint-config": "6.0.0-beta.12"
   },
   "peerDependencies": {
     "@vitest/eslint-plugin": "^1.6.4",