Merge pull request #282 from davidtheclark/add-filepath-to-loader-errors

add filepath to loader errors

CHANGELOG.md

@@ -4,10 +4,11 @@
 
 - **Breaking change:** Drop support for Node 10.
 - **Breaking change:** Use npm package [js-yaml](https://www.npmjs.com/package/js-yaml) to parse YAML instead of npm package [yaml](https://www.npmjs.com/package/yaml).
+- Added: Loader errors now include the path of the file that was tried to be loaded.
 
 ## 7.1.0
 
-- Added: additional default `searchPlaces` within a .config subdirectory (without leading dot in the file name)
+- Added: Additional default `searchPlaces` within a .config subdirectory (without leading dot in the file name)
 
 ## 7.0.1
 

src/Explorer.ts

@@ -1,8 +1,8 @@
 import path from 'path';
-import { ExplorerBase } from './ExplorerBase';
-import { readFile } from './readFile';
 import { cacheWrapper } from './cacheWrapper';
+import { ExplorerBase } from './ExplorerBase';
 import { getDirectory } from './getDirectory';
+import { readFile } from './readFile';
 import { CosmiconfigResult, ExplorerOptions, LoadedFileContent } from './types';
 
 class Explorer extends ExplorerBase<ExplorerOptions> {
@@ -78,8 +78,12 @@ class Explorer extends ExplorerBase<ExplorerOptions> {
       return undefined;
     }
     const loader = this.getLoaderEntryForFile(filepath);
-    const loaderResult = await loader(filepath, content);
-    return loaderResult;
+    try {
+      return await loader(filepath, content);
+    } catch (e) {
+      e.filepath = filepath;
+      throw e;
+    }
   }
 
   private async createCosmiconfigResult(

src/ExplorerSync.ts

@@ -1,8 +1,8 @@
 import path from 'path';
-import { ExplorerBase } from './ExplorerBase';
-import { readFileSync } from './readFile';
 import { cacheWrapperSync } from './cacheWrapper';
+import { ExplorerBase } from './ExplorerBase';
 import { getDirectorySync } from './getDirectory';
+import { readFileSync } from './readFile';
 import {
   CosmiconfigResult,
   ExplorerOptionsSync,
@@ -77,9 +77,12 @@ class ExplorerSync extends ExplorerBase<ExplorerOptionsSync> {
       return undefined;
     }
     const loader = this.getLoaderEntryForFile(filepath);
-    const loaderResult = loader(filepath, content);
-
-    return loaderResult;
+    try {
+      return loader(filepath, content);
+    } catch (e) {
+      e.filepath = filepath;
+      throw e;
+    }
   }
 
   private createCosmiconfigResultSync(