Skip to content

Commit

Permalink
chore: resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkrone committed Nov 7, 2017
2 parents c476c3b + 8883417 commit 5b996ed
Show file tree
Hide file tree
Showing 17 changed files with 197 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
* _2.0.0_
* Serialization support for actions. _Details:_ The normalization of entities is now perfomed in the action constructor. Previously it was handled by the reducer. As ([@PachowStudios](https://github.com/PachowStudios)) pointed out in Issue #16, ngrx-normalizr actions were not serializable. This could raise issues with other redux/ngrx libraries. The normalizr `schema.Entity` is not part of the action payload anymore, hence the interfaces for describing the payload have changed and the action constructor does no longer take the payload itself as an argument. As long as you did not type any action parameters in your code or dispatched actions directly with a simle pojo by using the exported action type names, you should have no problem updating, since the arity/keys of the constructor API did not change - see Breaking Changes. Closes #16

* _2.0.0_
* Serialization support for actions. _Details:_ The normalization of entities is now perfomed in the action constructor. Previously it was handled by the reducer. As ([@PachowStudios](https://github.com/PachowStudios)) pointed out in Issue #16, ngrx-normalizr actions were not serializable. This could raise issues with other redux/ngrx libraries. The normalizr `schema.Entity` is not part of the action payload anymore, hence the interfaces for describing the payload have changed and the action constructor does no longer take the payload itself as an argument. As long as you did not type any action parameters in your code or dispatched actions directly with a simle pojo by using the exported action type names, you should have no problem updating, since the arity/keys of the constructor API did not change - see Breaking Changes. (Closes #16)

* **Breaking Changes**
* Action constructor parameters changed from `NormalizeDataPayload` to `NormalizeActionConfig` and from `NormalizeRemovePayload` to `NormalizeRemoveActionConfig`
* Action `payload` property types changed from `NormalizeDataPayload` to `NormalizeActionPayload` and from `NormalizeRemovePayload` to `NormalizeRemoveActionPayload`
Expand Down
12 changes: 12 additions & 0 deletions docs/classes/_actions_normalize_.adddata.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ <h3>constructor</h3>
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L178">actions/normalize.ts:178</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L178">actions/normalize.ts:178</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -163,7 +167,11 @@ <h3>payload</h3>
<div class="tsd-signature tsd-kind-icon">payload<span class="tsd-signature-symbol">:</span> <a href="../interfaces/_actions_normalize_.normalizeactionpayload.html" class="tsd-signature-type">NormalizeActionPayload</a></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L178">actions/normalize.ts:178</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L178">actions/normalize.ts:178</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -179,7 +187,11 @@ <h3>type</h3>
<div class="tsd-signature tsd-kind-icon">type<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;NormalizeActionTypes.ADD_DATA</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L172">actions/normalize.ts:172</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L172">actions/normalize.ts:172</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
12 changes: 12 additions & 0 deletions docs/classes/_actions_normalize_.normalizeactiontypes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ <h3><span class="tsd-flag ts-flagStatic">Static</span> ADD_<wbr>DATA</h3>
<div class="tsd-signature tsd-kind-icon">ADD_<wbr>DATA<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;&#x60;${ACTION_NAMESPACE} Add Data&#x60;</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L131">actions/normalize.ts:131</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L131">actions/normalize.ts:131</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -122,7 +126,11 @@ <h3><span class="tsd-flag ts-flagStatic">Static</span> REMOVE_<wbr>DATA</h3>
<div class="tsd-signature tsd-kind-icon">REMOVE_<wbr>DATA<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;&#x60;${ACTION_NAMESPACE} Remove Data&#x60;</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L136">actions/normalize.ts:136</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L136">actions/normalize.ts:136</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -137,7 +145,11 @@ <h3><span class="tsd-flag ts-flagStatic">Static</span> SET_<wbr>DATA</h3>
<div class="tsd-signature tsd-kind-icon">SET_<wbr>DATA<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;&#x60;${ACTION_NAMESPACE} Set Data&#x60;</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L126">actions/normalize.ts:126</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L126">actions/normalize.ts:126</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
12 changes: 12 additions & 0 deletions docs/classes/_actions_normalize_.removedata.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ <h3>constructor</h3>
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L203">actions/normalize.ts:203</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L203">actions/normalize.ts:203</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -150,7 +154,11 @@ <h3>payload</h3>
<div class="tsd-signature tsd-kind-icon">payload<span class="tsd-signature-symbol">:</span> <a href="../interfaces/_actions_normalize_.normalizeremoveactionpayload.html" class="tsd-signature-type">NormalizeRemoveActionPayload</a></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L203">actions/normalize.ts:203</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L203">actions/normalize.ts:203</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -166,7 +174,11 @@ <h3>type</h3>
<div class="tsd-signature tsd-kind-icon">type<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;NormalizeActionTypes.REMOVE_DATA</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L197">actions/normalize.ts:197</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L197">actions/normalize.ts:197</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
12 changes: 12 additions & 0 deletions docs/classes/_actions_normalize_.setdata.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ <h3>constructor</h3>
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L153">actions/normalize.ts:153</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L153">actions/normalize.ts:153</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -163,7 +167,11 @@ <h3>payload</h3>
<div class="tsd-signature tsd-kind-icon">payload<span class="tsd-signature-symbol">:</span> <a href="../interfaces/_actions_normalize_.normalizeactionpayload.html" class="tsd-signature-type">NormalizeActionPayload</a></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L153">actions/normalize.ts:153</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L153">actions/normalize.ts:153</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -179,7 +187,11 @@ <h3>type</h3>
<div class="tsd-signature tsd-kind-icon">type<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> =&nbsp;NormalizeActionTypes.SET_DATA</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L147">actions/normalize.ts:147</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L147">actions/normalize.ts:147</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
8 changes: 8 additions & 0 deletions docs/interfaces/_actions_normalize_.normalizeactionconfig.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ <h3>data</h3>
<div class="tsd-signature tsd-kind-icon">data<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">T</span><span class="tsd-signature-symbol">[]</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeactionconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L78">actions/normalize.ts:78</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L78">actions/normalize.ts:78</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeactionconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -136,7 +140,11 @@ <h3>schema</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="_actions_normalize_.normalizeactionschemaconfig.html">NormalizeActionSchemaConfig</a>.<a href="_actions_normalize_.normalizeactionschemaconfig.html#schema">schema</a></p>
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeactionconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeactionconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
12 changes: 12 additions & 0 deletions docs/interfaces/_actions_normalize_.normalizeactioncreators.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ <h3>add<wbr>Data</h3>
<div class="tsd-signature tsd-kind-icon">add<wbr>Data<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">function</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L111">actions/normalize.ts:111</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L111">actions/normalize.ts:111</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -151,7 +155,11 @@ <h3>remove<wbr>Data</h3>
<div class="tsd-signature tsd-kind-icon">remove<wbr>Data<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">function</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L116">actions/normalize.ts:116</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L116">actions/normalize.ts:116</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down Expand Up @@ -190,7 +198,11 @@ <h3>set<wbr>Data</h3>
<div class="tsd-signature tsd-kind-icon">set<wbr>Data<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">function</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L106">actions/normalize.ts:106</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L106">actions/normalize.ts:106</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
8 changes: 8 additions & 0 deletions docs/interfaces/_actions_normalize_.normalizeactionpayload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ <h3>entities</h3>
<div class="tsd-signature tsd-kind-icon">entities<span class="tsd-signature-symbol">:</span> <a href="_reducers_normalize_.entitymap.html" class="tsd-signature-type">EntityMap</a></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L30">actions/normalize.ts:30</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L30">actions/normalize.ts:30</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -122,7 +126,11 @@ <h3>result</h3>
<div class="tsd-signature tsd-kind-icon">result<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">[]</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L35">actions/normalize.ts:35</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L35">actions/normalize.ts:35</a></li>
>>>>>>> origin/master
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
4 changes: 4 additions & 0 deletions docs/interfaces/_actions_normalize_.normalizeactionschemaconfig.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ <h3>schema</h3>
<div class="tsd-signature tsd-kind-icon">schema<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">Entity</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeactionschemaconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeactionschemaconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
12 changes: 12 additions & 0 deletions docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ <h3>id</h3>
<div class="tsd-signature tsd-kind-icon">id<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L90">actions/normalize.ts:90</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L90">actions/normalize.ts:90</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -128,7 +132,11 @@ <h3><span class="tsd-flag ts-flagOptional">Optional</span> remove<wbr>Children</
<div class="tsd-signature tsd-kind-icon">remove<wbr>Children<span class="tsd-signature-symbol">:</span> <a href="_actions_normalize_.schemamap.html" class="tsd-signature-type">SchemaMap</a></div>
<aside class="tsd-sources">
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L96">actions/normalize.ts:96</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L96">actions/normalize.ts:96</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand All @@ -145,7 +153,11 @@ <h3>schema</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="_actions_normalize_.normalizeactionschemaconfig.html">NormalizeActionSchemaConfig</a>.<a href="_actions_normalize_.normalizeactionschemaconfig.html#schema">schema</a></p>
<ul>
<<<<<<< HEAD:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/6fa4021/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
=======
<li>Defined in <a href="https://github.com/michaelkrone/ngrx-normalizr/blob/ab53558/src/actions/normalize.ts#L67">actions/normalize.ts:67</a></li>
>>>>>>> origin/master:docs/interfaces/_actions_normalize_.normalizeremoveactionconfig.html
</ul>
</aside>
<div class="tsd-comment tsd-typography">
Expand Down
Loading

0 comments on commit 5b996ed

Please sign in to comment.