Set up meta+schema merging unit tests for flat (passing) and legacy (…

…failing)
eslint · Feb 15, 2024 · 0dc4810 · 0dc4810
1 parent 6b9b8ac
commit 0dc4810
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 4 deletions.
diff --git a/lib/config/rule-validator.js b/lib/config/rule-validator.js
@@ -166,7 +166,7 @@ class RuleValidator {
             if (validateRule) {
 
                 const slicedOptions = ruleOptions.slice(1);
-                const mergedOptions = deepMergeArrays(rule.meta && rule.meta.defaultOptions, slicedOptions);
+                const mergedOptions = deepMergeArrays(rule.meta?.defaultOptions, slicedOptions);
 
                 validateRule(mergedOptions);
 

diff --git a/tests/lib/linter/linter.js b/tests/lib/linter/linter.js
@@ -6763,7 +6763,7 @@ var a = "test2";
     });
 
     describe("options", () => {
-        it("rules should apply meta.defaultOptions and ignore schema defaults", () => {
+        it("rules should apply meta.defaultOptions on top of schema defaults", () => {
             linter.defineRule("my-rule", {
                 meta: {
                     defaultOptions: [{
@@ -6783,7 +6783,10 @@ var a = "test2";
                 create(context) {
                     return {
                         Program(node) {
-                            context.report({ node, message: JSON.stringify(context.options[0]) });
+                            context.report({
+                                message: JSON.stringify(context.options[0]),
+                                node
+                            });
                         }
                     };
                 }
@@ -6800,7 +6803,7 @@ var a = "test2";
 
             assert.deepStrictEqual(
                 JSON.parse(messages[0].message),
-                { inBoth: "from-default-options", inDefaultOptions: "from-default-options" }
+                { inBoth: "from-default-options", inDefaultOptions: "from-default-options", inSchema: "from-schema" }
             );
         });
     });
@@ -15451,6 +15454,56 @@ var a = "test2";
         });
     });
 
+    describe("options", () => {
+        it("rules should apply meta.defaultOptions on top of schema defaults", () => {
+            const config = {
+                plugins: {
+                    test: {
+                        rules: {
+                            checker: {
+                                meta: {
+                                    defaultOptions: [{
+                                        inBoth: "from-default-options",
+                                        inDefaultOptions: "from-default-options"
+                                    }],
+                                    schema: [{
+                                        type: "object",
+                                        properties: {
+                                            inBoth: { default: "from-schema", type: "string" },
+                                            inDefaultOptions: { type: "string" },
+                                            inSchema: { default: "from-schema", type: "string" }
+                                        },
+                                        additionalProperties: false
+                                    }]
+                                },
+                                create(context) {
+                                    return {
+                                        Program(node) {
+                                            context.report({
+                                                message: JSON.stringify(context.options[0]),
+                                                node
+                                            });
+                                        }
+                                    };
+                                }
+                            }
+                        }
+                    }
+                },
+                rules: {
+                    "test/checker": "error"
+                }
+            };
+
+            const messages = linter.verify("foo", config, filename);
+
+            assert.deepStrictEqual(
+                JSON.parse(messages[0].message),
+                { inBoth: "from-default-options", inDefaultOptions: "from-default-options", inSchema: "from-schema" }
+            );
+        });
+    });
+
     describe("processors", () => {
         let receivedFilenames = [];
         let receivedPhysicalFilenames = [];