Fix merging of nested options objects from API #197
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…w nested opts to merge properly
jescalan
reviewed
Nov 22, 2016
lib/config.js
Outdated
| } | ||
|
|
||
| return finalObject | ||
| } |
There was a problem hiding this comment.
So something like _.merge might be a better approach here...
djeglin
commented
Nov 22, 2016
jescalan
approved these changes
Nov 22, 2016
lib/config.js
Outdated
| // merges API options into app.js options | ||
| let allOpts = Object.assign(this.parseAppJs(opts), opts) | ||
| let appJsOpts = this.parseAppJs(opts) | ||
| let allOpts = merge(appJsOpts, opts) |
There was a problem hiding this comment.
any reason to separate out appJsOpts to a variable here?
There was a problem hiding this comment.
There was when I was using the custom functions as it was a little easier to understand (and didn't mess about between contexts so much), but it may be better now to revert this line to have this.parseAppJs(opts) inline.
There was a problem hiding this comment.
Ok let's swap that back, then looks good to merge!
|
🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relates to static-dev/spike#38
Referenced PR exposed issue that nested options objects being passed from the API are not merged properly with options from
App.js– BecauseObject.assigncopies the full reference over if the value of a key:value pair is an object. This was leading to server options set inApp.jsbeing ignored.This PR fixes this issue by changing the way options are merged to use a method suitable for nested objects.
There is a new test to check that the merge is operating properly.