fix(functional-parameters): default options not being applied to opti…

…on overrides (#888)
eslint-functional · Oct 20, 2024 · 06f2b80 · 06f2b80
1 parent e36178c
commit 06f2b80
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 13 deletions.
diff --git a/docs/rules/functional-parameters.md b/docs/rules/functional-parameters.md
@@ -132,11 +132,24 @@ const defaults = {
 
 ```ts
 const recommendedOptions = {
-  enforceParameterCount: {
-    ignoreLambdaExpression: true,
-    ignoreIIFE: true,
-    ignoreGettersAndSetters: true,
-  },
+  enforceParameterCount: false,
+  overrides: [
+    {
+      specifiers: [
+        {
+          from: "file",
+        },
+      ],
+      options: {
+        enforceParameterCount: {
+          count: "atLeastOne",
+          ignoreLambdaExpression: true,
+          ignoreIIFE: true,
+          ignoreGettersAndSetters: true,
+        },
+      },
+    },
+  ],
 };
 ```
 

diff --git a/src/configs/recommended.ts b/src/configs/recommended.ts
@@ -41,6 +41,7 @@ const overrides = {
           ],
           options: {
             enforceParameterCount: {
+              count: "atLeastOne",
               ignoreLambdaExpression: true,
               ignoreIIFE: true,
               ignoreGettersAndSetters: true,

diff --git a/src/rules/functional-parameters.ts b/src/rules/functional-parameters.ts
@@ -127,7 +127,7 @@ const schema: JSONSchema4[] = [
 /**
  * The default options for the rule.
  */
-const defaultOptions: RawOptions = [
+const defaultOptions = [
   {
     allowRestParameter: false,
     allowArgumentsKeyword: false,
@@ -138,7 +138,7 @@ const defaultOptions: RawOptions = [
       ignoreGettersAndSetters: true,
     },
   },
-];
+] satisfies RawOptions;
 
 /**
  * The possible error messages.
@@ -234,6 +234,31 @@ function getParamCountViolations(
   return [];
 }
 
+/**
+ * Add the default options to the given options.
+ */
+function getOptionsWithDefaults(
+  options: Readonly<Options> | null,
+): Options | null {
+  if (options === null) {
+    return null;
+  }
+
+  const topLevel = {
+    ...defaultOptions[0],
+    ...options,
+  };
+  return typeof topLevel.enforceParameterCount === "object"
+    ? {
+        ...topLevel,
+        enforceParameterCount: {
+          ...defaultOptions[0].enforceParameterCount,
+          ...topLevel.enforceParameterCount,
+        },
+      }
+    : topLevel;
+}
+
 /**
  * Check if the given function node has a reset parameter this rule.
  */
@@ -243,10 +268,8 @@ function checkFunction(
   rawOptions: Readonly<RawOptions>,
 ): RuleResult<keyof typeof errorMessages, RawOptions> {
   const options = upgradeRawOverridableOptions(rawOptions[0]);
-  const optionsToUse = getCoreOptions<CoreOptions, Options>(
-    node,
-    context,
-    options,
+  const optionsToUse = getOptionsWithDefaults(
+    getCoreOptions<CoreOptions, Options>(node, context, options),
   );
 
   if (optionsToUse === null) {
@@ -291,10 +314,11 @@ function checkIdentifier(
 
   const functionNode = getEnclosingFunction(node);
   const options = upgradeRawOverridableOptions(rawOptions[0]);
-  const optionsToUse =
+  const optionsToUse = getOptionsWithDefaults(
     functionNode === null
       ? options
-      : getCoreOptions<CoreOptions, Options>(functionNode, context, options);
+      : getCoreOptions<CoreOptions, Options>(functionNode, context, options),
+  );
 
   if (optionsToUse === null) {
     return {