[PATCH] - fix bug that caused default values to be ignored (#11)

Author: evanshortiss

CHANGELOG.md

@@ -1,3 +1,7 @@
+
+## 3.0.1 (13/10/17)
+* Fix bug that caused default values to be ignored
+
 ## 3.0.0 (13/10/17)
 * Public API no longer is a function, instead exposes two functions, `mock` and `get`
 * Drop support for Node.js versions less than 4.0
@@ -10,7 +14,7 @@
 * Use `standard` for code quality and formatting
 
 ## 2.4.3 (5/04/17)
-* Update with build, coverage, and version information badges.
+* Update with build, coverage, and version information badges
 
 ## 2.4.2 (19/12/2016)
 * Fix TypeScript definition file

lib/variable.js

@@ -32,9 +32,15 @@ function generateAccessor (container, varName, defValue, accessorPath) {
     let value = container[varName]
 
     if (typeof value === 'undefined') {
-      // Need to simply return since no value is available. If a value needed to
-      // be available required() should be called
-      return
+      if (typeof defValue === 'undefined') {
+        // Need to return since no value is available. If a value needed to
+        // be available required() should be called, or a default passed
+        return
+      }
+
+      // Assign the default as the value since process.env does not contain
+      // the desired variable
+      value = defValue
     }
 
     const args = [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-var",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Solution for loading and sanatizing environment variables in node.js with correct typings",
   "main": "env-var.js",
   "typings": "env-var.d.ts",

test/index.js

@@ -40,6 +40,14 @@ describe('env-var', function () {
     })
   })
 
+  describe('default values', function () {
+    it('should return the default', function () {
+      const ret = mod.get('XXX_NOT_DEFINED', 'default').asString()
+
+      expect(ret).to.equal('default')
+    })
+  })
+
   describe('#asString', function () {
     it('should return a string', function () {
       expect(mod.get('STRING').asString()).to.be.a('string')