Skip to content

Commit 6460eb5

Browse files
committed
fixes current tests
1 parent 36fac38 commit 6460eb5

File tree

4 files changed

+43
-401
lines changed

4 files changed

+43
-401
lines changed

lib/loader.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,24 +96,28 @@ const recursivelyLoadRulesets = async (ruleset, loadedRulesets, options) => {
9696
text = fs.readFileSync(rulesetFile, 'utf8');
9797
}
9898

99-
const data = yaml.safeLoad(text);
99+
try {
100+
const data = yaml.safeLoad(text);
100101

101-
loadedRulesets.push(ruleset);
102+
loadedRulesets.push(ruleset);
102103

103-
if (typeof data.require == 'string') {
104-
const requiredLoadedFiles = await recursivelyLoadRulesets(data.require, loadedRulesets, options);
105-
loadedRulesets = loadedRulesets.concat(requiredLoadedFiles);
106-
}
104+
if (typeof data.require == 'string') {
105+
const requiredLoadedFiles = await recursivelyLoadRulesets(data.require, loadedRulesets, options);
106+
loadedRulesets = loadedRulesets.concat(requiredLoadedFiles);
107+
}
107108

108-
if (data.rules) {
109-
if (verbose > 1) {
110-
console.log(`Found ${data.rules.length} rules in ${ruleset}: ${data.rules.map(x => x.name)}`);
109+
if (data.rules) {
110+
if (verbose > 1) {
111+
console.log(`Found ${data.rules.length} rules in ${ruleset}: ${data.rules.map(x => x.name)}`);
112+
}
113+
// Create and hold the rules
114+
rules.createNewRules(data.rules);
111115
}
112-
// Create and hold the rules
113-
rules.createNewRules(data.rules);
114-
}
115116

116-
return loadedRulesets;
117+
return loadedRulesets;
118+
} catch (ex) {
119+
throw new ReadError(ex.message);
120+
}
117121
}
118122

119123
async function asyncMap(array, callback) {

0 commit comments

Comments
 (0)