Merge pull request #8 from fabrix-app/v1.1

[fix] value null in config

Author: scott-wyatt

lib/Configuration.ts

@@ -34,7 +34,8 @@ export class Configuration extends Map<any, any> {
       Object.entries(tree).forEach(([k, v]) => {
         // if (typeof v === 'object' && v !== null) {
         if (
-          v instanceof Object
+          v !== null
+          && v instanceof Object
           && typeof v !== 'function'
         ) {
           // If value is an array, flatten by index and don't try to flatten further
@@ -163,7 +164,8 @@ export class Configuration extends Map<any, any> {
    */
   private _flattenSet(key, value) {
     if (
-      value instanceof Object
+      value !== null
+      && value instanceof Object
       && typeof value !== 'function'
       && !Array.isArray(value)
     ) {
@@ -202,7 +204,10 @@ export class Configuration extends Map<any, any> {
       }
       // If configAction is set to merge, it will default values over the initial config
       else if (hasKey && configAction === 'merge') {
-        if (Array.isArray(value)) {
+        if (value === null) {
+          // Do Nothing
+        }
+        else if (Array.isArray(value)) {
           // Do Nothing
         }
         else if (typeof value === 'number') {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/fabrix",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Strongly Typed Modern Web Application Framework for Node.js",
   "keywords": [
     "framework",

package.json

@@ -159,6 +159,23 @@ describe('Fabrix', () => {
           })
         })
 
+        it('should be able to reassign a previously null value', () => {
+          const def = {
+            pkg: { },
+            api: { },
+            config: {
+              main: {
+                spools: [ Testspool ]
+              },
+              test: {
+                prefix: '/api'
+              }
+            }
+          }
+          const app = new FabrixApp(def)
+          assert.equal(app.config.get('test.prefix'), '/api')
+        })
+
         it('should disallow re-assignment of config object', () => {
           const def = {
             pkg: { },

test/integration/fabrixapp.test.js

@@ -7,7 +7,8 @@ module.exports = {
   },
   config: {
     test: {
-      val: 1
+      val: 1,
+      prefix: '/api'
     },
     main: {
       paths: {

test/integration/testapp.js

@@ -11,7 +11,8 @@ module.exports = class Testspool extends Spool {
         test: {
           val: 0,
           array: [3, 4, 5],
-          otherval: 1
+          otherval: 1,
+          prefix: null
         }
       },
       api: {

test/integration/testspool.js

@@ -72,7 +72,8 @@ describe('lib.Configuration', () => {
         array: [1, 2, 3],
         subobj: {
           attr: 'a'
-        }
+        },
+        nullValue: null
       }
     }
   })
@@ -245,6 +246,19 @@ describe('lib.Configuration', () => {
       beforeEach(() => {
         config = new lib.Configuration(_.cloneDeep(testConfig))
       })
+      it('should set leaves as well as root', () => {
+
+        config.set('test', null)
+        assert.equal(config.get('test'), null)
+        config.set('test', 'word')
+        assert.equal(config.get('test'), 'word')
+      })
+
+      it('should set leaves as well as root on a previously null value', () => {
+        config.set('customerObject.nullValue', 'word')
+        assert.equal(config.get('customerObject.nullValue'), 'word')
+      })
+
       it('should set leaves as well as root', () => {
 
         config.set('test', {test2: {test3: 4}})