Merge pull request #197 from NickBolles/master

marshallswain · web-flow · commit 77d46b844ed3 · 2019-02-15T11:08:22.000-07:00
Use merge for toJson object
diff --git a/src/service-module/model.js b/src/service-module/model.js
@@ -1,4 +1,5 @@
 import fastCopy from 'fast-copy'
+import _merge from 'lodash.merge'
 
 const defaults = {
   idField: 'id',
@@ -170,7 +171,7 @@ export default function (options) {
     _remove () {}
 
     toJSON () {
-      return fastCopy(this)
+      return _merge({}, this)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import fastCopy from 'fast-copy'`
	`2`	`+import _merge from 'lodash.merge'`
`2`	`3`
`3`	`4`	`const defaults = {`
`4`	`5`	`idField: 'id',`
`@@ -170,7 +171,7 @@ export default function (options) {`
`170`	`171`	`_remove () {}`
`171`	`172`
`172`	`173`	`toJSON () {`
`173`		`- return fastCopy(this)`
	`174`	`+ return _merge({}, this)`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`