From 4ea0105e82b77d671eba66822cc61b19befd16bc Mon Sep 17 00:00:00 2001 From: Paul Hawxby Date: Thu, 28 Sep 2017 14:57:46 +0100 Subject: [PATCH 1/2] More useful error messages --- core/lib/data_loader.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/core/lib/data_loader.js b/core/lib/data_loader.js index a91911f3e..8608b74aa 100644 --- a/core/lib/data_loader.js +++ b/core/lib/data_loader.js @@ -20,7 +20,12 @@ function loadFile(dataFilesPath, fsDep) { dataFile = _.head(dataFiles); if (dataFile && fsDep.existsSync(path.resolve(dataFile))) { - return yaml.safeLoad(fsDep.readFileSync(path.resolve(dataFile), 'utf8')); + try { + return yaml.safeLoad(fsDep.readFileSync(path.resolve(dataFile), 'utf8')); + } + catch (err) { + throw new Error(`Error loading file: ${dataFile} - ${err.message}`); + } } } @@ -48,8 +53,13 @@ function loadDataFromFolder(dataFilesPath, excludeFileNames, fsDep) { let mergeObject = {}; dataFiles.forEach(function (filePath) { - let jsonData = yaml.safeLoad(fsDep.readFileSync(path.resolve(filePath), 'utf8')); - mergeObject = _.merge(mergeObject, jsonData); + try { + let jsonData = yaml.safeLoad(fsDep.readFileSync(path.resolve(filePath), 'utf8')); + mergeObject = _.merge(mergeObject, jsonData); + } + catch (err) { + throw new Error(`Error loading file: ${dataFile} - ${err.message}`); + } }); return mergeObject; From e7e3cd440467707e6690dd0d2b7320ab7b256b11 Mon Sep 17 00:00:00 2001 From: Paul Hawxby Date: Thu, 28 Sep 2017 15:45:22 +0100 Subject: [PATCH 2/2] Whoops --- core/lib/data_loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/data_loader.js b/core/lib/data_loader.js index 8608b74aa..580b8470c 100644 --- a/core/lib/data_loader.js +++ b/core/lib/data_loader.js @@ -58,7 +58,7 @@ function loadDataFromFolder(dataFilesPath, excludeFileNames, fsDep) { mergeObject = _.merge(mergeObject, jsonData); } catch (err) { - throw new Error(`Error loading file: ${dataFile} - ${err.message}`); + throw new Error(`Error loading file: ${filePath} - ${err.message}`); } });