WIP: Validate rule options

eslint · Apr 7, 2015 · 212cff7 · 212cff7
1 parent 9ecefa3
commit 212cff7
Show file tree

Hide file tree

Showing 31 changed files with 484 additions and 17 deletions.
diff --git a/conf/eslint.json b/conf/eslint.json
@@ -137,7 +137,7 @@
         "max-statements": [0, 10],
         "new-cap": 2,
         "new-parens": 2,
-	"newline-after-var": 0,
+        "newline-after-var": 0,
         "one-var": 0,
         "operator-assignment": [0, "always"],
         "operator-linebreak": 0,

diff --git a/lib/config.js b/lib/config.js
@@ -11,16 +11,18 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var fs = require("fs"),
-    path = require("path"),
+var assign = require("object-assign"),
+    debug = require("debug"),
     environments = require("../conf/environments"),
-    util = require("./util"),
     FileFinder = require("./file-finder"),
+    fs = require("fs"),
+    path = require("path"),
+    rules = require('./rules'),
     stripComments = require("strip-json-comments"),
-    assign = require("object-assign"),
-    debug = require("debug"),
-    yaml = require("js-yaml"),
-    userHome = require("user-home");
+    userHome = require("user-home"),
+    util = require("./util"),
+    validate = require("./validate-options"),
+    yaml = require("js-yaml");
 
 //------------------------------------------------------------------------------
 // Constants
@@ -61,6 +63,12 @@ function loadConfig(filePath) {
         }
     }
 
+    if (config.rules) {
+        Object.keys(config.rules).forEach(function (name) {
+            validate(name, config.rules[name], filePath);
+        });
+    }
+
     return config;
 }
 

diff --git a/lib/eslint.js b/lib/eslint.js
@@ -632,7 +632,7 @@ module.exports = (function() {
                 var ruleCreator = rules.get(key),
                     severity = getRuleSeverity(config.rules[key]),
                     options = getRuleOptions(config.rules[key]),
-                    rule;
+                    rule, valid;
 
                 if (ruleCreator) {
                     try {

diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js
@@ -202,3 +202,23 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["1tbs", "stroustrup"]
+        },
+        {
+            "type": "object",
+            "properties": {
+                "allowSingleLine": {
+                    "type": "boolean"
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 2
+};
diff --git a/lib/rules/camelcase.js b/lib/rules/camelcase.js
@@ -97,3 +97,20 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "properties": {
+                    "type": "string",
+                    "enum": ["always", "never"]
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/comma-dangle.js b/lib/rules/comma-dangle.js
@@ -56,3 +56,14 @@ module.exports = function (context) {
         "ArrayExpression": checkForTrailingComma
     };
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["always", "always-multiline", "never"]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/comma-spacing.js b/lib/rules/comma-spacing.js
@@ -157,3 +157,22 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "before": {
+                    "type": "boolean"
+                },
+                "after": {
+                    "type": "boolean"
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/curly.js b/lib/rules/curly.js
@@ -101,3 +101,14 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["all", "multi", "multi-line"]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/dot-notation.js b/lib/rules/dot-notation.js
@@ -102,3 +102,22 @@ module.exports = function(context) {
         }
     };
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "allowKeywords": {
+                    "type": "boolean"
+                },
+                "allowPattern": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/eqeqeq.js b/lib/rules/eqeqeq.js
@@ -88,3 +88,14 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["smart", "allow-null"]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/key-spacing.js b/lib/rules/key-spacing.js
@@ -305,3 +305,26 @@ module.exports = function(context) {
     }
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "align": {
+                    "type": "string",
+                    "enum": ["colon", "value"]
+                },
+                "beforeColon": {
+                    "type": "boolean"
+                },
+                "afterColon": {
+                    "type": "boolean"
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/max-len.js b/lib/rules/max-len.js
@@ -63,3 +63,19 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "integer",
+            "minimum": 0
+        },
+        {
+            "type": "integer",
+            "minimum": 0
+        }
+    ],
+    "minItems": 2,
+    "maxItems": 2
+};
diff --git a/lib/rules/new-cap.js b/lib/rules/new-cap.js
@@ -195,3 +195,34 @@ module.exports = function(context) {
 
     return listeners;
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "newIsCap": {
+                    "type": "boolean"
+                },
+                "capIsNew": {
+                    "type": "boolean"
+                },
+                "newIsCapExceptions": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "capIsNewExceptions": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js
@@ -115,3 +115,14 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["except-parens", "always"]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-inner-declarations.js b/lib/rules/no-inner-declarations.js
@@ -70,3 +70,14 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "string",
+            "enum": ["functions", "both"]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-mixed-spaces-and-tabs.js b/lib/rules/no-mixed-spaces-and-tabs.js
@@ -66,3 +66,13 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "enum": ["smart-tabs", true, false]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-multi-spaces.js b/lib/rules/no-multi-spaces.js
@@ -99,3 +99,25 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "type": "object",
+            "properties": {
+                "exceptions": {
+                    "type": "object",
+                    "patternProperties": {
+                        "^([A-Z][a-z]*)+$": {
+                            "type": "boolean"
+                        }
+                    },
+                    "additionalProperties": false
+                }
+            },
+            "additionalProperties": false
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-unused-vars.js b/lib/rules/no-unused-vars.js
@@ -178,3 +178,28 @@ module.exports = function(context) {
     };
 
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "oneOf": [
+                {
+                    "enum": ["all", "local"]
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "vars": {
+                            "enum": ["all", "local"]
+                        },
+                        "args": {
+                            "enum": ["all", "after-used", "none"]
+                        }
+                    }
+                }
+            ]
+        }
+    ],
+    "maxItems": 1
+};
diff --git a/lib/rules/no-use-before-define.js b/lib/rules/no-use-before-define.js
@@ -65,3 +65,13 @@ module.exports = function(context) {
         "ArrowFunctionExpression": findVariables
     };
 };
+
+module.exports.schema = {
+    "type": "array",
+    "items": [
+        {
+            "enum": ["nofunc"]
+        }
+    ],
+    "maxItems": 1
+};