Merge pull request #21 from SimenB/bool-false

Allow passing in `false` to `bool`
af · Dec 28, 2016 · 68f95bd · 68f95bd
2 parents 3d711b3 + 635a0ff
commit 68f95bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -48,15 +48,19 @@ function cleanEnv(inputEnv, specs = {}, options = {}) {
     for (const k of varKeys) {
         const spec = specs[k]
         const devDefault = (env.NODE_ENV === 'production' ? undefined : spec.devDefault)
-        const rawValue = env[k] || (devDefault === undefined ? spec.default : devDefault)
+        let rawValue = env[k]
+
+        if (rawValue === undefined) {
+            rawValue = (devDefault === undefined ? spec.default : devDefault)
+        }
 
         // Default values can be anything falsy (besides undefined), without
         // triggering validation errors:
         const usingFalsyDefault = ((spec.default !== undefined) && (spec.default === rawValue)) ||
                                   ((devDefault !== undefined) && (devDefault === rawValue))
 
         try {
-            if (!rawValue && !usingFalsyDefault) throw new EnvMissingError(spec.desc || '')
+            if (rawValue === undefined && !usingFalsyDefault) throw new EnvMissingError(spec.desc || '')
             output[k] = validateVar({ name: k, spec, rawValue })
         } catch (err) {
             if (options.reporter === null) throw err

diff --git a/tests/test_types.js b/tests/test_types.js
@@ -5,11 +5,16 @@ const test = createGroup()
 const makeSilent = { reporter: null }
 
 
-test('bool() works with various boolean string formats', () => {
+test('bool() works with various formats', () => {
     assert.equal(bool().type, 'bool')
     assert.throws(() => cleanEnv({ FOO: 'asfd' }, { FOO: bool() }, makeSilent),
                   EnvError, 'Invalid value')
 
+    const trueBool = cleanEnv({ FOO: true }, { FOO: bool() })
+    assert.deepEqual(trueBool, { FOO: true })
+    const falseBool = cleanEnv({ FOO: false }, { FOO: bool() })
+    assert.deepEqual(falseBool, { FOO: false })
+
     const truthyNum = cleanEnv({ FOO: '1' }, { FOO: bool() })
     assert.deepEqual(truthyNum, { FOO: true })
     const falsyNum = cleanEnv({ FOO: '0' }, { FOO: bool() })