Comparing version 0.1.7 to 0.2.0
16
index.js
@@ -19,2 +19,3 @@ 'use strict'; | ||
var serializers = require('./serializers'); | ||
var UnknownFormatError = require('./unknown-format-error'); | ||
@@ -57,8 +58,17 @@ //==================================================================== | ||
function noop() {} | ||
function rethrow(error) { | ||
throw error; | ||
} | ||
//==================================================================== | ||
var load = function (name, defaults) { | ||
defaults = merge({}, defaults || {}); | ||
var load = function (name, opts) { | ||
opts || (opts = {}); | ||
var defaults = merge({}, opts.defaults || {}); | ||
var ignoreUnknownFormats = opts.ignoreUnknownFormats; | ||
var unknownFormatHandler = ignoreUnknownFormats ? noop : rethrow; | ||
return Promise.each(entries, function (entry) { | ||
@@ -75,3 +85,3 @@ return entry.read({ | ||
merge(defaults, value); | ||
}); | ||
}).catch(UnknownFormatError, unknownFormatHandler); | ||
}); | ||
@@ -78,0 +88,0 @@ }).return(defaults); |
{ | ||
"name": "app-conf", | ||
"version": "0.1.7", | ||
"version": "0.2.0", | ||
"description": "", | ||
@@ -21,5 +21,3 @@ "keywords": [], | ||
"files": [ | ||
"index.js", | ||
"entries.js", | ||
"serializers.js" | ||
"*.js" | ||
], | ||
@@ -26,0 +24,0 @@ "dependencies": { |
@@ -8,2 +8,4 @@ 'use strict'; | ||
var UnknownFormatError = require('./unknown-format-error'); | ||
//==================================================================== | ||
@@ -94,3 +96,3 @@ | ||
if (!format) { | ||
throw new Error('no compatible format found for '+ file); | ||
throw new UnknownFormatError('no compatible format found for '+ file.path); | ||
} | ||
@@ -97,0 +99,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
8853
6
253