refactor(kit): simplify LanguagePreferenceSchema (#1033)

Author: Rel1cx

packages/utilities/ast/src/get-nested-return-statements.ts

@@ -11,8 +11,8 @@ import { isFunction } from "./is";
  * @returns The nested return statements in the node
  */
 export function getNestedReturnStatements(node: TSESTree.Node): readonly TSESTree.ReturnStatement[] {
-  const returnStatements: TSESTree.ReturnStatement[] = [];
-  const functionNode = isFunction(node)
+  const statements: TSESTree.ReturnStatement[] = [];
+  const boundaryNode = isFunction(node)
     ? node
     : findParentNode(node, isFunction);
   simpleTraverse(node, {
@@ -21,11 +21,11 @@ export function getNestedReturnStatements(node: TSESTree.Node): readonly TSESTre
         return;
       }
       const parentFunction = findParentNode(node, isFunction);
-      if (parentFunction !== functionNode) {
+      if (parentFunction !== boundaryNode) {
         return;
       }
-      returnStatements.push(node);
+      statements.push(node);
     },
   });
-  return returnStatements;
+  return statements;
 }

packages/utilities/kit/docs/@eslint-react/namespaces/LanguagePreference/variables/DEFAULT_LANGUAGE_PREFERENCE.md

@@ -12,42 +12,26 @@ The default language preference.
 
 ## Type declaration
 
-### bracketSameLine
-
-> **bracketSameLine**: `boolean`
-
-### bracketSpacing
-
-> **bracketSpacing**: `boolean`
-
-### endOfLine
-
-> **endOfLine**: `"lf"` \| `"crlf"` \| `"cr"` \| `"auto"`
-
 ### indentStyle
 
-> **indentStyle**: `"tab"` \| `"space"`
+> `readonly` **indentStyle**: `"space"` = `"space"`
 
 ### indentWidth
 
-> **indentWidth**: `number`
-
-### insertFinalNewline
-
-> **insertFinalNewline**: `boolean`
+> `readonly` **indentWidth**: `2` = `2`
 
 ### jsxQuoteStyle
 
-> **jsxQuoteStyle**: `"preferDouble"` \| `"preferSingle"`
+> `readonly` **jsxQuoteStyle**: `"double"` = `"double"`
 
 ### quoteStyle
 
-> **quoteStyle**: `"preferDouble"` \| `"preferSingle"` \| `"alwaysDouble"` \| `"alwaysSingle"`
+> `readonly` **quoteStyle**: `"single"` = `"single"`
 
-### semicolon
+### semicolons
 
-> **semicolon**: `"always"` \| `"prefer"` \| `"asi"`
+> `readonly` **semicolons**: `"always"` = `"always"`
 
-### trailingComma
+### trailingCommas
 
-> **trailingComma**: `"all"` \| `"es5"` \| `"none"`
+> `readonly` **trailingCommas**: `"all"` = `"all"`

packages/utilities/kit/src/LanguagePreference/LanguagePreference.ts

@@ -1,6 +1,6 @@
 import type { SharedConfigurationSettings } from "@typescript-eslint/utils/ts-eslint"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import { type InferOutput, parse } from "valibot";
-import { LanguagePreferenceSchema } from "./LanguagePreferenceSchema";
+import type { LanguagePreferenceSchema } from "./LanguagePreferenceSchema";
+import { type InferOutput } from "valibot";
 
 /**
  * @internal
@@ -10,7 +10,14 @@ export type LanguagePreference = InferOutput<typeof LanguagePreferenceSchema>;
 /**
  * The default language preference.
  */
-export const DEFAULT_LANGUAGE_PREFERENCE = parse(LanguagePreferenceSchema, {});
+export const DEFAULT_LANGUAGE_PREFERENCE = {
+  indentStyle: "space",
+  indentWidth: 2,
+  jsxQuoteStyle: "double",
+  quoteStyle: "single",
+  semicolons: "always",
+  trailingCommas: "all",
+} as const satisfies LanguagePreference;
 
 declare module "@typescript-eslint/utils/ts-eslint" {
   export interface SharedConfigurationSettings {

packages/utilities/kit/src/LanguagePreference/LanguagePreferenceSchema.ts

@@ -1,20 +1,9 @@
-import { boolean, literal, number, object, optional, union } from "valibot";
+import { literal, number, object, optional, union } from "valibot";
 
 /**
  * @internal
  */
 export const LanguagePreferenceSchema = object({
-  bracketSameLine: optional(boolean(), false),
-  bracketSpacing: optional(boolean(), true),
-  endOfLine: optional(
-    union([
-      literal("lf"),
-      literal("crlf"),
-      literal("cr"),
-      literal("auto"),
-    ]),
-    "lf",
-  ),
   indentStyle: optional(
     union([
       literal("tab"),
@@ -23,37 +12,35 @@ export const LanguagePreferenceSchema = object({
     "space",
   ),
   indentWidth: optional(number(), 2),
-  insertFinalNewline: optional(boolean(), true),
-  jsxQuoteStyle: optional(
-    union([
-      literal("preferDouble"),
-      literal("preferSingle"),
-    ]),
-    "preferDouble",
-  ),
   quoteStyle: optional(
     union([
-      literal("alwaysDouble"),
-      literal("alwaysSingle"),
-      literal("preferDouble"),
-      literal("preferSingle"),
+      literal("single"),
+      literal("double"),
     ]),
-    "preferSingle",
+    "single",
   ),
-  semicolon: optional(
+  semicolons: optional(
     union([
       literal("always"),
-      literal("prefer"),
-      literal("asi"),
+      literal("asNeeded"),
     ]),
     "always",
   ),
-  trailingComma: optional(
+  trailingCommas: optional(
     union([
       literal("all"),
       literal("es5"),
       literal("none"),
     ]),
     "all",
   ),
+
+  // JSX specific options
+  jsxQuoteStyle: optional(
+    union([
+      literal("single"),
+      literal("double"),
+    ]),
+    "double",
+  ),
 });