Merge branch 'master' into release/version-8

Author: safo6m

CHANGELOG.md

@@ -1,3 +1,7 @@
+# [8.1.2-beta]
+
+  * Merge fixes from version 7.1.2
+
 # [8.1.1-beta]
 
   * Merge fixes from version 7.1.1
@@ -10,6 +14,10 @@
 
   * Allow upgrade to Angular 8
 
+# [7.1.2]
+
+  * Fix parsing has many relationships when there is no models provided
+
 # [7.1.1]
 
   * Allow removal of HasMany relations by setting empty array ([#224](https://github.com/ghidoz/angular2-jsonapi/pull/224))

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-jsonapi",
-  "version": "8.1.1-beta",
+  "version": "8.1.2-beta",
   "description": "A lightweight Angular 2 adapter for JSON API",
   "scripts": {
     "build": "rimraf dist src/compiled && tslint src/**/*.ts && ngc",

package.json

@@ -129,6 +129,18 @@ describe('JsonApiModel', () => {
         });
       });
 
+      it('should return an empty array for hasMany relationship when one is included without any elements', () => {
+        const BOOK_NUMBER = 0;
+        const DATA = getAuthorData('books', BOOK_NUMBER);
+        author = new Author(datastore, DATA);
+        author.syncRelationships(DATA, getIncludedBooks(BOOK_NUMBER));
+
+        expect(author).toBeDefined();
+        expect(author.id).toBe(AUTHOR_ID);
+        expect(author.books).toBeDefined();
+        expect(author.books.length).toBe(BOOK_NUMBER);
+      });
+
       it('should parse infinite levels of relationships by reference', () => {
         const BOOK_NUMBER = 4;
         const DATA = getAuthorData('books', BOOK_NUMBER);

src/models/json-api.model.spec.ts

@@ -120,7 +120,7 @@ export class JsonApiModel {
       for (const metadata of hasMany) {
         const relationship: any = data.relationships ? data.relationships[metadata.relationship] : null;
 
-        if (relationship && relationship.data && relationship.data.length > 0) {
+        if (relationship && relationship.data && Array.isArray(relationship.data)) {
           let allModels: JsonApiModel[] = [];
           const modelTypesFetched: any = [];
 
@@ -148,11 +148,9 @@ export class JsonApiModel {
                 throw { message: `parseHasMany - Model type for relationship ${typeName} not found.` };
               }
             }
-
-            if (allModels.length > 0) {
-              this[metadata.propertyName] = allModels;
-            }
           }
+
+          this[metadata.propertyName] = allModels;
         }
       }
     }