Added support for extra file extensions

HELP

@@ -7,3 +7,4 @@ Options:
    --reporter           custom reporter
    --jslint-reporter    use a jslint compatible xml reporter
    --show-non-errors    show additional data generated by jshint
+   --extra-ext          comma-separated list of file extension to use (.js is default)

README.md

@@ -48,6 +48,12 @@ Specify custom lint options (see [example/config.json](https://github.com/jshint
 
 Note: This bypasses any .jshintrc files.
 
+## File Extensions
+
+Default extension for files is ".js". If you want to use JSHint with other file extensions (.json), you need to pass this extra extension as an option
+
+    --extra-ext .json
+
 ## Default Options
 
 The CLI uses the default options that come with JSHint. However, if it locates a .jshintrc file in your home directory (~/) it will use those options first.

lib/cli.js

@@ -73,8 +73,9 @@ module.exports = {
             projectConfig = path.join(process.cwd(), '.jshintrc'),
             customConfig = options["--config"],
             customReporter = options["--reporter"] ? path.resolve(process.cwd(), options["--reporter"]) : null,
+            extraExtensionList = options["--extra-ext"],
             targets = options.node;
-       
+
         //could be on Windows which we are looking for an attribute ending in 'node.exe'
         if (targets === undefined) {
             (function () {
@@ -90,7 +91,7 @@ module.exports = {
         }
 
         targets = typeof targets === "string" ? null : targets.slice(1);
-
+        extraExtensionList = typeof extraExtensionList === "string" ? extraExtensionList : "";
 
         if (options["--version"]) {
             _version();
@@ -134,7 +135,7 @@ module.exports = {
             });
         }
 
-        _print(hint.hint(targets, config, reporter, ignore));
+        _print(hint.hint(targets, config, reporter, ignore, extraExtensionList));
     }
 };
 

lib/hint.js

@@ -69,28 +69,29 @@ function _shouldIgnore(somePath, ignore) {
     });
 }
 
-function _collect(filePath, files, ignore) {
+function _collect(filePath, files, ignore, extraExtensionList) {
     if (ignore && _shouldIgnore(filePath, ignore)) {
         return;
     }
-
+    extraExtensionList = extraExtensionList || "";
+    var regExtension = new RegExp("\.(js" + (extraExtensionList === "" ? "" : "|" + extraExtensionList.replace(/,/g,"|").replace(/[\. ]/g,"") ) +")$");
     if (fs.statSync(filePath).isDirectory()) {
         fs.readdirSync(filePath).forEach(function (item) {
             _collect(path.join(filePath, item), files, ignore);
         });
-    } else if (filePath.match(/\.js$/)) {
+    } else if (filePath.match(regExtension)) {
         files.push(filePath);
     }
 }
 
 module.exports = {
-    hint: function (targets, config, reporter, ignore) {
+    hint: function (targets, config, reporter, ignore, extraExtensionList) {
         var files = [],
             results = [],
             data = [];
 
         targets.forEach(function (target) {
-            _collect(target, files, ignore);
+            _collect(target, files, ignore, extraExtensionList);
         });
 
         files.forEach(function (file) {

test/unit/cli.js

@@ -125,6 +125,16 @@ describe("cli", function () {
         expect(hint.hint.mostRecentCall.args[2]).toEqual(reporter);
     });
 
+    it("interprets --extra-ext with no extension list and only uses the .js extension", function () {
+        cli.interpret(["node", "hint", "file.js", "file1.js", "--extra-ext"]);
+        expect(hint.hint.mostRecentCall.args[4]).toEqual("");
+    });
+
+    it("interprets --extra-ext with .json in extension list and uses the .js and .json extensions", function () {
+        cli.interpret(["node", "file.js", "file.js", "--extra-ext", ".json"]);
+        expect(hint.hint.mostRecentCall.args[4]).toEqual(".json");
+    });
+
     it("reads in a .jshintignore file if present in current working directory", function () {
         spyOn(path, "existsSync").andCallFake(function (path) {
             return path.match(/\.jshintignore/) ? true : false;

test/unit/hint.js

@@ -28,7 +28,7 @@ describe("hint", function () {
     });
 
     it("collects files", function () {
-        var targets = ["file1.js", "file2.js", ".hidden"];
+        var targets = ["file1.js", "file2.js", ".hidden", "file4.json"];
 
         mockJSHINT(true);
         spyOn(fs, "readFileSync").andReturn("data");
@@ -41,10 +41,30 @@ describe("hint", function () {
 
         expect(fs.readFileSync.callCount).toEqual(2);
         expect(fs.readFileSync).not.toHaveBeenCalledWith(targets[2], "utf-8");
+        expect(fs.readFileSync).not.toHaveBeenCalledWith(targets[3], "utf-8");
         expect(fs.readFileSync).toHaveBeenCalledWith(targets[0], "utf-8");
         expect(fs.readFileSync).toHaveBeenCalledWith(targets[1], "utf-8");
     });
 
+    it("collects files with other extensions", function () {
+        var targets = ["file1.js", ".hidden", "file4.json"];
+        var extraExt = ".json";
+
+        mockJSHINT(true);
+        spyOn(fs, "readFileSync").andReturn("data");
+
+        spyOn(fs, "statSync").andReturn({
+            isDirectory: jasmine.createSpy().andReturn(false)
+        });
+
+        hint.hint(targets, null, null, false, extraExt);
+
+        expect(fs.readFileSync.callCount).toEqual(2);
+        expect(fs.readFileSync).toHaveBeenCalledWith(targets[2], "utf-8");
+        expect(fs.readFileSync).not.toHaveBeenCalledWith(targets[1], "utf-8");
+        expect(fs.readFileSync).toHaveBeenCalledWith(targets[0], "utf-8");
+    });
+
     it("collects directory files", function () {
         var targets = ["dir", "file2.js"];