fix: ignore relationships that don't have data property (#778)

Co-authored-by: Paul Warren <pdw@ex-parrot.com>
Co-authored-by: Vladimír Gorej <vladimir.gorej@gmail.com>

src/index.js

@@ -11,6 +11,7 @@ import {
   concat,
   insert,
   assocPath,
+  pickBy,
 } from 'ramda';
 import { mapIndexed, reduceIndexed, ensureArray, isArray } from 'ramda-adjunct';
 
@@ -24,7 +25,11 @@ import { mapIndexed, reduceIndexed, ensureArray, isArray } from 'ramda-adjunct';
 //     RelPath = {path: String, key: ResourceKey}
 
 // getRelationships :: Resource -> Relationships
-const getRelationships = pipe(propOr({}, ['relationships']), keys);
+const getRelationships = pipe(
+  propOr({}, ['relationships']),
+  pickBy(has('data')),
+  keys
+);
 
 // resourceKey :: ResourceRel -> ResourceKey
 const resourceKey = ({ type, id }) => `${type}-${id}`;

test/index.js

@@ -763,10 +763,27 @@ describe('jsonApiMerge', function () {
     };
 
     specify('should throw error', function () {
-      const included = jsonApiMerge(jsonApiData.included, jsonApiData.included);
-      const thunk = () => jsonApiMerge(included, jsonApiData.data);
+      const expected = {
+        id: 1,
+        type: 'resource',
+        attributes: {
+          name: 'Resource name',
+        },
+        relationships: {
+          related: {
+            links: {
+              related: {
+                href: 'http://example.com/related-resource/',
+                title: 'Related',
+              },
+            },
+          },
+        },
+      };
 
-      assert.throws(thunk, TypeError);
+      const actual = jsonApiMerge(jsonApiData.included, jsonApiData.data);
+
+      assert.deepEqual(actual, expected);
     });
   });