Fix file matching with relative tsconfig.json path (#2688)

* Add test for tsconfig extends

* Fix problem with relative paths

src/linter.ts

@@ -56,19 +56,15 @@ class Linter {
     /**
      * Creates a TypeScript program object from a tsconfig.json file path and optional project directory.
      */
-    public static createProgram(configFile: string, projectDirectory?: string): ts.Program {
-        if (projectDirectory === undefined) {
-            projectDirectory = path.dirname(configFile);
-        }
-
+    public static createProgram(configFile: string, projectDirectory: string = path.dirname(configFile)): ts.Program {
         const { config } = ts.readConfigFile(configFile, ts.sys.readFile);
         const parseConfigHost: ts.ParseConfigHost = {
             fileExists: fs.existsSync,
             readDirectory: ts.sys.readDirectory,
             readFile: (file) => fs.readFileSync(file, "utf8"),
             useCaseSensitiveFileNames: true,
         };
-        const parsed = ts.parseJsonConfigFileContent(config, parseConfigHost, projectDirectory);
+        const parsed = ts.parseJsonConfigFileContent(config, parseConfigHost, path.resolve(projectDirectory));
         const host = ts.createCompilerHost(parsed.options, true);
         const program = ts.createProgram(parsed.fileNames, parsed.options, host);
 

test/executable/executableTests.ts

@@ -267,6 +267,27 @@ describe("Executable", function(this: Mocha.ISuiteCallbackContext) {
                     done();
                 });
         });
+
+        it("can extend `tsconfig.json` with relative path", (done) => {
+            execCli(
+                ["-c", "test/files/tsconfig-extends-relative/tslint-ok.json", "-p",
+                 "test/files/tsconfig-extends-relative/test/tsconfig.json"],
+                (err) => {
+                    assert.isNull(err, "process should exit without an error");
+                    done();
+                });
+        });
+
+        it("can extend `tsconfig.json` with relative path II", (done) => {
+            execCli(
+                ["-c", "test/files/tsconfig-extends-relative/tslint-fail.json", "-p",
+                 "test/files/tsconfig-extends-relative/test/tsconfig.json"],
+                (err) => {
+                    assert.isNotNull(err, "process should exit with error");
+                    assert.strictEqual(err.code, 2, "error code should be 2");
+                    done();
+                });
+        });
     });
 
     describe("--type-check", () => {

test/files/tsconfig-extends-relative/src/src.test.ts

@@ -0,0 +1 @@
+export interface Test {}

test/files/tsconfig-extends-relative/test/test.test.ts

@@ -0,0 +1 @@
+export interface IFoo {}

test/files/tsconfig-extends-relative/test/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": [
+    "../src"
+  ]
+}

test/files/tsconfig-extends-relative/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {},
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts"
+  ]
+}

test/files/tsconfig-extends-relative/tslint-fail.json

@@ -0,0 +1,8 @@
+{
+    "rules":{
+        "interface-name": [
+            true,
+            "never-prefix"
+        ]
+    }
+}

test/files/tsconfig-extends-relative/tslint-ok.json

@@ -0,0 +1,8 @@
+{
+    "rules":{
+        "interface-name": [
+            true,
+            "always-prefix"
+        ]
+    }
+}