Handle extends option correctly in when calling tslint

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
 npm-debug.log
 tmp/
+yarn.lock
 tests/fixtures/output.txt

index.js

@@ -2,7 +2,8 @@ var Filter = require('broccoli-persistent-filter');
 var chalk = require('chalk');
 var existsSync = require('exists-sync');
 var path = require('path');
-var Linter = require("tslint").Linter;
+var Linter = require('tslint').Linter;
+var Configuration = require('tslint').Configuration;
 var fs = require('fs');
 
 function TSLint(inputNode, options) {
@@ -11,7 +12,6 @@ function TSLint(inputNode, options) {
   }
   options = options || {};
 
-  this.configuration = { rules: {} };
   this.options = {
     outputFile: options.outputFile,
     failBuild: options.failBuild || false,
@@ -20,24 +20,17 @@ function TSLint(inputNode, options) {
     logError: options.logError
   };
 
-  var tslintConfigPath = path.resolve('tslint.json');
+  this.tslintConfigPath = 'tslint.json';
   if (options.configuration) {
-    tslintConfigPath = path.resolve(options.configuration);
+    this.tslintConfigPath = options.configuration;
   } else {
     console.log(this.createLogMessage('Using tslint.json as the default file for linting rules', 'blue'));
   }
 
-  if (!existsSync(tslintConfigPath)) {
+  if (!existsSync(this.tslintConfigPath)) {
     throw new Error('Cannot find tslint configuration file: ' + tslintConfigPath);
   }
 
-  try {
-    this.configuration = JSON.parse(fs.readFileSync(tslintConfigPath, 'utf8'));
-  } catch (e) {
-    var message = 'Cannot parse configuration file: ' + tslintConfigPath;
-    throw new Error(this.createLogMessage(message, 'red'));
-  }
-
   if (!options.formatter) {
     // default formatter
     this.options.formatter = 'prose';
@@ -92,7 +85,8 @@ TSLint.prototype.build = function () {
 
 TSLint.prototype.processString = function(content, relativePath) {
   var linter = new Linter(this.options);
-  linter.lint(relativePath, content, this.configuration);
+  var configLoad = Configuration.findConfiguration(this.tslintConfigPath, relativePath);
+  linter.lint(relativePath, content, configLoad.results);
   var result = linter.getResult();
 
   this.totalFiles++;

tests/fixtures/errorFiles/errorFile1.ts

@@ -1 +1 @@
-var Xx = "abcd";
+var Xx = "abcd"; 

tests/fixtures/lintConfig/extends-format.json

@@ -0,0 +1,3 @@
+{
+  "extends": "tslint:recommended"
+}

tests/index.js

@@ -38,36 +38,6 @@ describe('broccoli-tslinter', function() {
     assert.throws(willThrow);
   });
 
-  it('should throw error during parsing of configuration file', function() {
-    var willThrow = function() {
-      var node = new TSLint('./tests/fixtures/errorFiles', {
-        logError: function(message) {
-          loggerOutput.push(message)
-        },
-        configuration: './tests/fixtures/lintConfig/parse-error.json'
-      });
-      builder = new broccoli.Builder(node);
-      return builder.build();
-    };
-
-    assert.throws(willThrow);
-  });
-
-  it('should throw error when configuration file does not follow format', function() {
-    var willThrow = function() {
-      var node = new TSLint('./tests/fixtures/errorFiles', {
-        logError: function(message) {
-          loggerOutput.push(message)
-        },
-        configuration: './tests/fixtures/lintConfig/incorrect-format.json'
-      });
-      builder = new broccoli.Builder(node);
-      return builder.build();
-    };
-
-    assert.throws(willThrow);
-  });
-
   it('linting correct file should result in no lint errors', function() {
     var node = new TSLint('./tests/fixtures/lintedFiles', {
       logError: function(message) {
@@ -92,6 +62,19 @@ describe('broccoli-tslinter', function() {
     });
   });
 
+  it('linting error files with extends format should result in lint errors', function() {
+    var node = new TSLint('./tests/fixtures/errorFiles', {
+      logError: function(message) {
+        loggerOutput.push(message);
+      },
+      configuration: './tests/fixtures/lintConfig/extends-format.json'
+    });
+    builder = new broccoli.Builder(node);
+    return builder.build().then(function() {
+      assert.notEqual(loggerOutput.length, 0, 'Errors should be seen for linted files');
+    });
+  });
+
   it('linting errors should be the same on subsequent runs', function() {
     var node = new TSLint('./tests/fixtures/errorFiles', {
       logError: function(message) {