style: update code style to follow 'curly' and 'curly-newline' (#909)

Author: Rel1cx

eslint.config.ts

@@ -3,6 +3,7 @@ import url from "node:url";
 
 import eslintJs from "@eslint/js";
 import eslintMarkdown from "@eslint/markdown";
+import eslintStylistic from "@stylistic/eslint-plugin";
 import eslintPluginImport from "eslint-plugin-import-x";
 import eslintPluginJsdoc from "eslint-plugin-jsdoc";
 import eslintPluginLocal from "@workspace/eslint-plugin-local";
@@ -128,6 +129,7 @@ export default tseslint.config(
       },
     },
     plugins: {
+      ["@stylistic"]: eslintStylistic,
       ["@susisu/safe-typescript"]: eslintPluginSafeTypeScript,
       ["local"]: eslintPluginLocal,
       ["simple-import-sort"]: eslintPluginSimpleImportSort,
@@ -137,6 +139,7 @@ export default tseslint.config(
   {
     files: [...GLOB_JS, ...GLOB_TS],
     rules: {
+      curly: "warn",
       eqeqeq: ["error", "always"],
       "no-console": "error",
       "no-else-return": "error",
@@ -195,6 +198,8 @@ export default tseslint.config(
       // Part: simple-import-sort rules
       "simple-import-sort/exports": "warn",
       "simple-import-sort/imports": "warn",
+      // Part: stylistic rules
+      "@stylistic/curly-newline": ["warn", "always"],
       // Part: perfectionist rules
       "perfectionist/sort-exports": "off",
       "perfectionist/sort-imports": "off",

examples/dual-react-dom-lib/package.json

@@ -2,6 +2,7 @@
   "name": "@examples/dual-react-dom-lib",
   "version": "0.0.0",
   "license": "MIT",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": {
@@ -16,6 +17,7 @@
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
+  "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -29,7 +31,7 @@
     "prepare": "pnpm run build"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^1.23.1",
+    "@eslint-react/eslint-plugin": "^1.23.2",
     "@eslint/js": "^9.17.0",
     "@tsconfig/node22": "^22.0.0",
     "@tsconfig/strictest": "^2.0.5",
@@ -46,10 +48,8 @@
   "peerDependencies": {
     "react": "^19.0.0"
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": ">=18.18.0"
-  },
-  "sideEffects": false,
-  "module": "dist/index.mjs",
-  "packageManager": "[email protected]"
+  }
 }

examples/next-app/package.json

@@ -16,7 +16,7 @@
     "react-dom": "latest"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^1.23.1",
+    "@eslint-react/eslint-plugin": "^1.23.2",
     "@eslint/config-inspector": "^0.7.0",
     "@eslint/js": "^9.17.0",
     "@next/eslint-plugin-next": "^15.1.3",

examples/vite-react-dom-app/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^1.23.1",
+    "@eslint-react/eslint-plugin": "^1.23.2",
     "@eslint/config-inspector": "^0.7.0",
     "@eslint/js": "^9.17.0",
     "@tsconfig/node22": "^22.0.0",

examples/vite-react-dom-js-app/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^1.23.1",
+    "@eslint-react/eslint-plugin": "^1.23.2",
     "@eslint/config-inspector": "^0.7.0",
     "@eslint/js": "^9.17.0",
     "@types/react": "^19.0.3",

examples/vite-react-dom-js-with-babel-app/package.json

@@ -19,7 +19,7 @@
     "@babel/eslint-parser": "^7.25.9",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.26.3",
-    "@eslint-react/eslint-plugin": "^1.23.1",
+    "@eslint-react/eslint-plugin": "^1.23.2",
     "@eslint/config-inspector": "^0.7.0",
     "@eslint/js": "^9.17.0",
     "@types/babel__core": "~7.20.5",

packages/core/package.json

@@ -13,6 +13,7 @@
   },
   "license": "MIT",
   "author": "Eva1ent<[email protected]>",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": {
@@ -27,6 +28,7 @@
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
+  "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -59,7 +61,5 @@
   "engines": {
     "bun": ">=1.0.15",
     "node": ">=18.18.0"
-  },
-  "sideEffects": false,
-  "module": "dist/index.mjs"
+  }
 }

packages/core/src/component/component-collector-legacy.ts

@@ -14,7 +14,9 @@ import { ERClassComponentFlag } from "./component-flag";
  * @returns `true` if the node is a class component, `false` otherwise
  */
 export function isClassComponent(node: TSESTree.Node): node is AST.TSESTreeClass {
-  if (!("superClass" in node && node.superClass)) return false;
+  if (!("superClass" in node && node.superClass)) {
+    return false;
+  }
   const { superClass } = node;
   return match(superClass)
     .with({
@@ -87,7 +89,9 @@ export function useComponentCollectorLegacy() {
   } as const;
 
   const collect = (node: AST.TSESTreeClass) => {
-    if (!isClassComponent(node)) return;
+    if (!isClassComponent(node)) {
+      return;
+    }
     const id = AST.getClassIdentifier(node);
     const key = getId();
     const flag = isPureComponent(node)

packages/core/src/component/component-collector.ts

@@ -79,7 +79,9 @@ export function useComponentCollector(
   };
   const onFunctionExit = () => {
     const { key, node, isComponent } = functionEntries.at(-1) ?? {};
-    if (!key || !node || !isComponent) return functionEntries.pop();
+    if (!key || !node || !isComponent) {
+      return functionEntries.pop();
+    }
     const shouldDrop = AST.getNestedReturnStatements(node.body)
       .slice()
       .reverse()
@@ -88,7 +90,9 @@ export function useComponentCollector(
           && r.argument !== null
           && !JSX.isJSXValue(r.argument, jsxCtx, hint);
       });
-    if (shouldDrop) components.delete(key);
+    if (shouldDrop) {
+      components.delete(key);
+    }
     return functionEntries.pop();
   };
 
@@ -107,13 +111,17 @@ export function useComponentCollector(
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const mbEntry = getCurrentFunction();
-      if (O.isNone(mbEntry)) return;
+      if (O.isNone(mbEntry)) {
+        return;
+      }
       const entry = mbEntry.value;
       const { body } = entry.node;
       const isComponent = hasNoneOrValidComponentName(entry.node, context)
         && JSX.isJSXValue(body, jsxCtx, hint)
         && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) return;
+      if (!isComponent) {
+        return;
+      }
       const initPath = AST.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = O.flatMapNullable(id, getComponentNameFromIdentifier);
@@ -138,33 +146,45 @@ export function useComponentCollector(
       const mbComponentName = match(left.object)
         .with({ type: T.Identifier }, n => O.some(n.name))
         .otherwise(O.none);
-      if (O.isNone(mbComponentName)) return;
+      if (O.isNone(mbComponentName)) {
+        return;
+      }
       const componentName = mbComponentName.value;
       const component = Array
         .from(components.values())
         .findLast(({ name }) => O.exists(name, n => n === componentName));
-      if (!component) return;
+      if (!component) {
+        return;
+      }
       components.set(component._, {
         ...component,
         displayName: O.some(right),
       });
     },
     "CallExpression[type]:exit"(node: TSESTree.CallExpression) {
-      if (!isReactHookCall(node)) return;
+      if (!isReactHookCall(node)) {
+        return;
+      }
       const mbEntry = getCurrentFunction();
-      if (O.isNone(mbEntry)) return;
+      if (O.isNone(mbEntry)) {
+        return;
+      }
       const entry = mbEntry.value;
       functionEntries.pop();
       functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
     },
     "ReturnStatement[type]"(node: TSESTree.ReturnStatement) {
       const mbEntry = getCurrentFunction();
-      if (O.isNone(mbEntry)) return;
+      if (O.isNone(mbEntry)) {
+        return;
+      }
       const entry = mbEntry.value;
       const isComponent = hasNoneOrValidComponentName(entry.node, context)
         && JSX.isJSXValue(node.argument, jsxCtx, hint)
         && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) return;
+      if (!isComponent) {
+        return;
+      }
       functionEntries.pop();
       functionEntries.push({ ...entry, isComponent });
       const initPath = AST.getFunctionInitPath(entry.node);

packages/core/src/component/component-id.ts

@@ -8,7 +8,9 @@ import { isReactHookCallWithNameLoose } from "../hook";
 import { isForwardRefCall, isMemoCall } from "../utils";
 
 function isComponentWrapperCall(node: TSESTree.Node, context: RuleContext) {
-  if (node.type !== T.CallExpression) return false;
+  if (node.type !== T.CallExpression) {
+    return false;
+  }
   return isMemoCall(node, context)
     || isForwardRefCall(node, context)
     || isReactHookCallWithNameLoose(node)("useCallback");
@@ -19,7 +21,9 @@ export function getFunctionComponentIdentifier(
   context: RuleContext,
 ): O.Option<TSESTree.Identifier | TSESTree.Identifier[]> {
   const functionId = AST.getFunctionIdentifier(node);
-  if (O.isSome(functionId)) return functionId;
+  if (O.isSome(functionId)) {
+    return functionId;
+  }
   const { parent } = node;
   // Get function component identifier from `const Component = memo(() => {});`
   if (