refactored traverse function

Author: nickforddev

src/demo/users_data.js

@@ -117,6 +117,24 @@ export default () => {
             $date: '2016-12-16T00:00:00'
           }
         }
+      ],
+      periods: [
+        {
+          start_date: {
+            $date: '2017-01-01T00:00:00Z'
+          },
+          amount: 1000,
+          _id: {
+            $oid: '59ef6461bee3c00d09a53cfc'
+          },
+          things: [
+            {
+              _id: {
+                $oid: '59ef6461bee3c00d09a53cfc'
+              }
+            }
+          ]
+        }
       ]
     },
     three: {
@@ -164,6 +182,24 @@ export default () => {
             $date: '2016-03-11T00:00:00'
           }
         }
+      ],
+      periods: [
+        {
+          start_date: {
+            $date: '2017-01-01T00:00:00Z'
+          },
+          amount: 1000,
+          _id: {
+            $oid: '59ef6461bee3c00d09a53cfc'
+          },
+          things: [
+            {
+              _id: {
+                $oid: '59ef6461bee3c00d09a53cfc'
+              }
+            }
+          ]
+        }
       ]
     }
   }

src/utils/index.js

@@ -1,7 +1,6 @@
 import {
   mergeDeepRight,
   clone,
-  path,
   reduce,
   isEmpty,
   equals
@@ -112,44 +111,36 @@ const traverse = (data, schema, func) => {
   let output = {}
   if (data instanceof Array) {
     output = data.map(item => {
-      if (schema.items.type) {
-        if ([Object, Array].includes(schema.items.type)) {
-          item = traverse(item, schema.items, func)
-        } else {
-          item = func(item, schema.items)
-        }
+      if ([Object, Array].includes(schema.items.type)) {
+        item = traverse(item, schema.items, func)
+      } else {
+        item = func(item, schema.items)
       }
       return item
     })
   } else if (data instanceof Object) {
     for (let key in data) {
-      validateSchema(schema, key)
-      if (schema[key] && schema[key].items) {
-        output[key] = traverse(data[key], schema[key], func)
-      } else if (schema[key] && schema[key].properties) {
-        output[key] = traverse(data[key], schema[key].properties, func)
-      } else if (schema && schema.properties) {
+      if (key in schema) {
+        if (schema[key].items) {
+          output[key] = traverse(data[key], schema[key], func)
+        } else if (schema[key].properties) {
+          output[key] = traverse(data[key], schema[key].properties, func)
+        } else {
+          output[key] = func(data[key], schema[key])
+        }
+      } else if (schema.properties) {
         output = traverse(data, schema.properties, func)
-        // output[key] = func(data[key], schema.properties[key])
-      } else if (key in schema) {
-        output[key] = func(data[key], schema[key])
       } else {
+        console.warn('Key missing from schema: ' + key)
         output[key] = data[key]
       }
     }
   } else {
-    // found a normal key: value prop
     output = func(data, schema)
   }
   return output
 }
 
-const validateSchema = (schema, key) => {
-  if ((schema[key] === undefined) && (path(['properties', key], schema) === undefined)) {
-    console.warn(`Key missing from schema: ${key}`)
-  }
-}
-
 // encode a model property
 
 export const encodeProperty = (data, schema = {}) => {