Fixes #3

dividab · Jan 24, 2017 · 297ae78 · 297ae78
1 parent 9a9578b
commit 297ae78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/config-loader.ts b/src/config-loader.ts
@@ -19,9 +19,11 @@ export function configLoader({
 }: ConfigLoaderParams) {
 
   if (explicitParams) {
+
     const absoluteBaseUrl = path.isAbsolute(explicitParams.baseUrl)
     ? explicitParams.baseUrl
     : path.join(cwd, explicitParams.baseUrl);
+
     return {
       absoluteBaseUrl,
       paths: explicitParams.paths

diff --git a/src/tsconfig-loader.ts b/src/tsconfig-loader.ts
@@ -20,8 +20,8 @@ export function tsConfigLoader({
 
   const TS_NODE_PROJECT = getEnv("TS_NODE_PROJECT");
 
-  const searchStart = TS_NODE_PROJECT || cwd;
-  const loadResult = loadSync(searchStart, undefined);
+  // tsconfig.loadSync handles if TS_NODE_PROJECT is a file or directory
+  const loadResult = loadSync(cwd, TS_NODE_PROJECT);
   return loadResult;
 
 }

diff --git a/tests/tsconfig-loader-tests.ts b/tests/tsconfig-loader-tests.ts
@@ -39,8 +39,8 @@ describe('tsconfig-loader', function () {
     const result = tsConfigLoader({
       cwd: "/foo/bar",
       getEnv: (key: string) => key === "TS_NODE_PROJECT" ? "/foo/baz" : undefined,
-      loadSync: (cwd: string) => {
-        if (cwd === "/foo/baz") {
+      loadSync: (cwd: string, fileName: string) => {
+        if (cwd === "/foo/bar" && fileName === "/foo/baz") {
           return {
             tsConfigPath: "/foo/baz/tsconfig.json",
             baseUrl: "./",